diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index bc4042da3..b502eaf4f 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -1892,18 +1892,18 @@ void CAudioPlayerGui::paintItemID3DetailsLine (int pos) m_frameBuffer->paintBoxRel(xpos + ConnectLineBox_Width - 4, ypos2+RADIUS_MID, 4, fh /*m_info_height*/, col1); - m_frameBuffer->paintBoxRel(xpos + ConnectLineBox_Width - 16, ypos1a+1, 4, ypos2a - ypos1a-1, col1); + m_frameBuffer->paintBoxRel(xpos + ConnectLineBox_Width - 16, ypos1a, 3, ypos2a - ypos1a+3, col1); - m_frameBuffer->paintBoxRel(xpos + ConnectLineBox_Width - 15, ypos1a, 11, 4, col1); - m_frameBuffer->paintBoxRel(xpos + ConnectLineBox_Width - 15, ypos2a, 11, 4, col1); + m_frameBuffer->paintBoxRel(xpos + ConnectLineBox_Width - 16, ypos1a, 12, 3, col1); + m_frameBuffer->paintBoxRel(xpos + ConnectLineBox_Width - 16, ypos2a, 12, 3, col1); // 2. col small line m_frameBuffer->paintBoxRel(xpos + ConnectLineBox_Width - 4, ypos2+RADIUS_MID, 1, fh /*m_info_height*/, col2); - m_frameBuffer->paintBoxRel(xpos + ConnectLineBox_Width - 16, ypos1a+1, 1, ypos2a - ypos1a + 4-1, col2); + m_frameBuffer->paintBoxRel(xpos + ConnectLineBox_Width - 16+3, ypos1a+3, 1, ypos2a - ypos1a-3, col2); - m_frameBuffer->paintBoxRel(xpos + ConnectLineBox_Width - 16, ypos1a, 12, 1, col2); - m_frameBuffer->paintBoxRel(xpos + ConnectLineBox_Width - 12, ypos2a, 8, 1, col2); + m_frameBuffer->paintBoxRel(xpos + ConnectLineBox_Width - 16+3, ypos1a+3, 12-3, 1, col2); + m_frameBuffer->paintBoxRel(xpos + ConnectLineBox_Width - 16, ypos2a+3, 12, 1, col2); // -- small Frame around infobox m_frameBuffer->paintBoxFrame(m_x, ypos2, m_width, m_info_height, 2, col1, RADIUS_MID); diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp index 83331c92a..2f544f4b1 100644 --- a/src/gui/bedit/bouqueteditor_channels.cpp +++ b/src/gui/bedit/bouqueteditor_channels.cpp @@ -222,14 +222,14 @@ void CBEChannelWidget::paintItem2DetailsLine (int pos, int /*ch_index*/) frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-4, ypos2+7, 4,info_height-14, col1); frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-4, ypos2+7, 1,info_height-14, col2); - frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos1a+1, 4,ypos2a-ypos1a-1, col1); - frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos1a+1, 1,ypos2a-ypos1a+4-1, col2); + frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos1a, 3,ypos2a-ypos1a+3, col1); + frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16+3, ypos1a+3, 1,ypos2a-ypos1a-3, col2); - frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-15, ypos1a, 11,4, col1); - frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos1a, 12,1, col2); + frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos1a, 12,3, col1); + frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16+3, ypos1a+3, 12-3,1, col2); - frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-15, ypos2a, 11,4, col1); - frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-12, ypos2a, 8,1, col2); + frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos2a, 12,3, col1); + frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos2a+3, 12,1, col2); frameBuffer->paintBoxFrame(x, ypos2, width, info_height, 2, col1, RADIUS_LARGE); } diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 76964a117..bdacdf5b6 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1579,16 +1579,16 @@ void CChannelList::paintItem2DetailsLine (int pos, int /*ch_index*/) frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-4, ypos2+7, 1,info_height-14, col2); /* vertical connect line */ - frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos1a+1, 4,ypos2a-ypos1a-1, col1); - frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos1a+1, 1,ypos2a-ypos1a+4-1, col2); + frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos1a, 3,ypos2a-ypos1a+3, col1); + frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16+3, ypos1a+3, 1,ypos2a-ypos1a-3, col2); /* vertical item line */ - frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-15, ypos1a, 11,4, col1); - frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos1a, 12,1, col2); + frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos1a, 12,3, col1); + frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16+3, ypos1a+3, 12-3,1, col2); /* vertical info line */ - frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-15, ypos2a, 11,4, col1); - frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-12, ypos2a, 8,1, col2); + frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos2a, 12,3, col1); + frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos2a+3, 12,1, col2); // frameBuffer->paintBoxRel(x, ypos2, width, info_height, col1, RADIUS_LARGE); frameBuffer->paintBoxFrame(x, ypos2, width, info_height, 2, col1, RADIUS_LARGE); diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index f4553c99e..b259136d5 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -1097,7 +1097,7 @@ printf("paintHint: icon %s text %s\n", item->hintIcon.c_str(), g_Locale->getText int ypos2a = ypos2 + (hint_height/2)-2; int markh = hint_height > rad*2 ? hint_height - rad*2 : hint_height; - int imarkh = iheight/2; + int imarkh = iheight/2+1; int imarkoff = iheight/4; /* horizontal item mark - */ @@ -1109,16 +1109,16 @@ printf("paintHint: icon %s text %s\n", item->hintIcon.c_str(), g_Locale->getText frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-4, ypos2+rad, 1 , markh, col2); /* vertical connect line [ */ - frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos1a+1, 4, ypos2a-ypos1a-1, col1); - frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos1a+1, 1, ypos2a-ypos1a+4-1, col2); + frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos1a, 3, ypos2a-ypos1a+3, col1); + frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16+3, ypos1a+3, 1, ypos2a-ypos1a-3, col2); /* vertical item line | */ - frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-15, ypos1a, 11, 4, col1); - frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos1a, 12, 1, col2); + frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos1a, 12, 3, col1); + frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16+3, ypos1a+3, 12-3, 1, col2); /* vertical info line | */ - frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-15, ypos2a, 11, 4, col1); - frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-12, ypos2a, 8, 1, col2); + frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos2a, 12, 3, col1); + frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos2a+3, 12, 1, col2); /* box shadow */ frameBuffer->paintBoxRel(x+SHADOW_OFFSET, ypos2+SHADOW_OFFSET, width + sb_width, hint_height, COL_MENUCONTENTDARK_PLUS_0, rad);