mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 02:11:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
M. Liebmann
2017-09-21 09:07:15 +02:00
parent 45fa2fcf4b 9f6e78974b
commit abfb02aa47
19 changed files with 236 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/widget/colorchooser.cpp
View File

@@ -117,7 +117,7 @@ void CColorChooser::setColor()
else
{
CComponentsShapeSquare preview(preview_x, preview_y, preview_w, preview_h, NULL, false, COL_FRAME_PLUS_0, col);
preview.setFrameThickness(1);
preview.setFrameThickness(FRAME_WIDTH_MIN);
preview.setCorner(RADIUS_SMALL);
preview.paint(false);
}

4
src/gui/widget/menue.cpp
View File

@@ -251,7 +251,7 @@ void CMenuItem::paintItemCaption(const bool select_mode, const char * right_text
right_frame_col = COL_MENUCONTENTINACTIVE_TEXT;
}
CComponentsShapeSquare col(stringstartposOption, y + OFFSET_INNER_SMALL, dx - stringstartposOption + x - OFFSET_INNER_MID, item_height - 2*OFFSET_INNER_SMALL, NULL, false, right_frame_col, right_bg_col);
col.setFrameThickness(3);
col.setFrameThickness(FRAME_WIDTH_MIN);
col.setCorner(RADIUS_SMALL);
col.paint(false);
}
@@ -1516,7 +1516,7 @@ void CMenuWidget::paintHint(int pos)
info_box = new CComponentsInfoBox();
info_box->setDimensionsAll(x, ypos2, iwidth, hint_height);
info_box->setFrameThickness(2);
info_box->setFrameThickness(FRAME_WIDTH_MIN);
info_box->removeLineBreaks(str);
info_box->setText(str, CTextBox::AUTO_WIDTH, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_HINT], COL_MENUCONTENT_TEXT);
info_box->setCorner(rad);

2
src/gui/widget/msgbox.cpp
View File

@@ -416,7 +416,7 @@ int ShowMsg2UTF( const char * const Title,
Text_mode);
if (color_frame != HINTBOX_DEFAULT_FRAME_COLOR){
msgBox.setFrameThickness(4);
msgBox.setFrameThickness(OFFSET_INNER_SMALL);
msgBox.setColorFrame(color_frame);
}

2
src/gui/widget/progresswindow.cpp
View File

@@ -122,7 +122,7 @@ CProgressBar* CProgressWindow::getProgressItem()
pBar->setDimensionsAll(OFFSET_INNER_MID, y_tmp, width-2*OFFSET_INNER_MID, g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight());
pBar->setColorBody(col_body);
pBar->setActiveColor(COL_PROGRESSBAR_ACTIVE_PLUS_0);
pBar->setFrameThickness(1);
pBar->setFrameThickness(FRAME_WIDTH_MIN);
pBar->setColorFrame(COL_PROGRESSBAR_ACTIVE_PLUS_0);
pBar->setType(CProgressBar::PB_TIMESCALE);
addWindowItem(pBar);