From bdbe2f5ab89dfece12b2bc5e4d4d4b7711c0437c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 20 Sep 2017 13:46:31 +0200 Subject: [PATCH] add and use FRAME_WIDTH defines; ... replace other fixed frame widths with OFFSET defines Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/6ee3e54741400131c173e16c0b10c50618ddca14 Author: vanhofen Date: 2017-09-20 (Wed, 20 Sep 2017) Origin message was: ------------------ - add and use FRAME_WIDTH defines; ... replace other fixed frame widths with OFFSET defines Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- src/gui/audioplayer.cpp | 2 +- src/gui/bedit/bouqueteditor_channels.cpp | 2 +- src/gui/bedit/bouqueteditor_chanselect.cpp | 2 +- src/gui/channellist.cpp | 6 +++--- src/gui/components/cc_frm_scrollbar.cpp | 2 +- src/gui/components/cc_item_progressbar.cpp | 2 +- src/gui/infoviewer.cpp | 2 +- src/gui/infoviewer_bb.cpp | 2 +- src/gui/osd_setup.cpp | 2 +- src/gui/volumebar.cpp | 2 +- src/gui/widget/colorchooser.cpp | 2 +- src/gui/widget/menue.cpp | 4 ++-- src/gui/widget/msgbox.cpp | 2 +- src/gui/widget/progresswindow.cpp | 2 +- src/system/settings.h | 1 + 15 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index 99b9ccb57..ff0a572d0 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -1855,7 +1855,7 @@ void CAudioPlayerGui::paintDetailsLine(int pos) if (m_infobox == NULL) { m_infobox = new CComponentsInfoBox(m_x, ypos2, m_width, m_info_height); - m_infobox->setFrameThickness(2); + m_infobox->setFrameThickness(FRAME_WIDTH_MIN); m_infobox->setCorner(RADIUS_LARGE); m_infobox->setColorFrame(COL_FRAME_PLUS_0); m_infobox->setColorBody(COL_MENUCONTENTDARK_PLUS_0); diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp index 1b405ae83..d8532bd1d 100644 --- a/src/gui/bedit/bouqueteditor_channels.cpp +++ b/src/gui/bedit/bouqueteditor_channels.cpp @@ -246,7 +246,7 @@ void CBEChannelWidget::initItem2DetailsLine (int pos, int /*ch_index*/) ibox->hide(); ibox->setDimensionsAll(x, ypos2, width, info_height); - ibox->setFrameThickness(2); + ibox->setFrameThickness(FRAME_WIDTH_MIN); #if 0 ibox->paint(false,true); #endif diff --git a/src/gui/bedit/bouqueteditor_chanselect.cpp b/src/gui/bedit/bouqueteditor_chanselect.cpp index e9ee12385..e02c467c0 100644 --- a/src/gui/bedit/bouqueteditor_chanselect.cpp +++ b/src/gui/bedit/bouqueteditor_chanselect.cpp @@ -307,7 +307,7 @@ void CBEChannelSelectWidget::initItem2DetailsLine (int pos, int /*ch_index*/) //infobox if (ibox){ ibox->setDimensionsAll(x, ypos2, width, info_height); - ibox->setFrameThickness(2); + ibox->setFrameThickness(FRAME_WIDTH_MIN); ibox->setCorner(RADIUS_LARGE); ibox->disableShadow(); } diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 0672956d9..f3d9cca38 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2011,11 +2011,11 @@ void CChannelList::paintItem(int pos, const bool firstpaint) pb.setDesign(g_settings.theme.progressbar_design_channellist); pb.setCornerType(0); pb.setStatusColors(COL_MENUCONTENT_PLUS_3, COL_MENUCONTENT_PLUS_1); - int pb_frame = 0; + int pb_frame = FRAME_WIDTH_NONE; if (g_settings.theme.progressbar_design_channellist == CProgressBar::PB_MONO && !g_settings.theme.progressbar_gradient) { // add small frame to mono progressbars w/o gradient for a better visibility - pb_frame = 1; + pb_frame = FRAME_WIDTH_MIN; } pb.setFrameThickness(pb_frame); pb.doPaintBg(false); @@ -2283,7 +2283,7 @@ void CChannelList::paintPig(int _x, int _y, int w, int h) if (cc_minitv == NULL){ cc_minitv = new CComponentsPIP (0, 0); cc_minitv->setPicture(NEUTRINO_ICON_AUDIOPLAY); - cc_minitv->setFrameThickness(5); + cc_minitv->setFrameThickness(OFFSET_INNER_SMALL); } //set changeable minitv properties cc_minitv->setDimensionsAll(_x, _y, w, h); diff --git a/src/gui/components/cc_frm_scrollbar.cpp b/src/gui/components/cc_frm_scrollbar.cpp index 13006e722..56891add4 100644 --- a/src/gui/components/cc_frm_scrollbar.cpp +++ b/src/gui/components/cc_frm_scrollbar.cpp @@ -155,7 +155,7 @@ void CComponentsScrollBar::initSegments() //init segment container if (sb_segments_obj == NULL){ sb_segments_obj = new CComponentsFrmChain(CC_CENTERED, CC_APPEND, w_seg, h_seg_obj, NULL, CC_DIR_Y, this, false); - sb_segments_obj->setFrameThickness(0); + sb_segments_obj->setFrameThickness(FRAME_WIDTH_NONE); }else sb_segments_obj->setDimensionsAll(CC_CENTERED, CC_APPEND, w_seg, h_seg_obj); diff --git a/src/gui/components/cc_item_progressbar.cpp b/src/gui/components/cc_item_progressbar.cpp index 543d71a8e..5a639c825 100644 --- a/src/gui/components/cc_item_progressbar.cpp +++ b/src/gui/components/cc_item_progressbar.cpp @@ -450,7 +450,7 @@ void CProgressBar::paintProgress(bool do_save_bg) pb_green /= sum; if (*pb_gradient) - setFrameThickness(0); + setFrameThickness(FRAME_WIDTH_NONE); initDimensions(); diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 323084f09..72f4298ce 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -344,7 +344,7 @@ void CInfoViewer::showRecordIcon (const bool show) { if (rec == NULL){ //TODO: full refactoring of this icon handler rec = new CComponentsShapeSquare(box_x, box_y , box_w, box_h, NULL, CC_SHADOW_ON, COL_RED, COL_INFOBAR_PLUS_0); - rec->setFrameThickness(2); + rec->setFrameThickness(FRAME_WIDTH_NONE); rec->setShadowWidth(OFFSET_SHADOW/2); rec->setCorner(RADIUS_MIN, CORNER_ALL); } diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index cea2656eb..0a0091a3b 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -863,7 +863,7 @@ void CInfoViewerBB::paint_ca_bar() if (ca_bar == NULL) ca_bar = new CComponentsShapeSquare(g_InfoViewer->ChanInfoX + OFFSET_INNER_MID, g_InfoViewer->BoxEndY, ca_width - 2*OFFSET_INNER_MID, bottom_bar_offset - OFFSET_INNER_MID, NULL, CC_SHADOW_ON, COL_INFOBAR_CASYSTEM_PLUS_2, COL_INFOBAR_CASYSTEM_PLUS_0); ca_bar->enableShadow(CC_SHADOW_ON, OFFSET_SHADOW/2, true); - ca_bar->setFrameThickness(2); + ca_bar->setFrameThickness(FRAME_WIDTH_MIN); ca_bar->setCorner(RADIUS_SMALL, CORNER_ALL); ca_bar->paint(CC_SAVE_SCREEN_NO); } diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index e6a97527c..c9e9835cc 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -1629,7 +1629,7 @@ void COsdSetup::paintWindowSize(int w, int h) { if (win_demo == NULL) { win_demo = new CComponentsShapeSquare(0, 0, 0, 0); - win_demo->setFrameThickness(8); + win_demo->setFrameThickness(OFFSET_INNER_MID); win_demo->disableShadow(); win_demo->setColorBody(COL_BACKGROUND); win_demo->setColorFrame(COL_RED); diff --git a/src/gui/volumebar.cpp b/src/gui/volumebar.cpp index 6205ee322..27c66fa6e 100644 --- a/src/gui/volumebar.cpp +++ b/src/gui/volumebar.cpp @@ -198,7 +198,7 @@ void CVolumeBar::initVolumeBarScale() vb_pb->setType(CProgressBar::PB_REDRIGHT); vb_pb->setRgb(85, 75, 100); - vb_pb->setFrameThickness(2); + vb_pb->setFrameThickness(FRAME_WIDTH_NONE); vb_pb->setProgress(vb_pbx, vb_pby, vb_pbw, vb_pbh, *vb_vol, 100); } diff --git a/src/gui/widget/colorchooser.cpp b/src/gui/widget/colorchooser.cpp index f4dfed170..9cee6d6f9 100644 --- a/src/gui/widget/colorchooser.cpp +++ b/src/gui/widget/colorchooser.cpp @@ -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); } diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 3b5f75749..8cae40d7d 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -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); } @@ -1517,7 +1517,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); diff --git a/src/gui/widget/msgbox.cpp b/src/gui/widget/msgbox.cpp index c1cdbfe30..79fa64e93 100644 --- a/src/gui/widget/msgbox.cpp +++ b/src/gui/widget/msgbox.cpp @@ -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); } diff --git a/src/gui/widget/progresswindow.cpp b/src/gui/widget/progresswindow.cpp index 26975c02a..27b4418c8 100644 --- a/src/gui/widget/progresswindow.cpp +++ b/src/gui/widget/progresswindow.cpp @@ -120,7 +120,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); diff --git a/src/system/settings.h b/src/system/settings.h index ad82d06d0..b6095f21c 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -944,6 +944,7 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO #define SCROLLBAR_WIDTH (OFFSET_INNER_MID + 2*OFFSET_INNER_MIN) #define FRAME_WIDTH_MIN CFrameBuffer::getInstance()->scale2Res(2) +#define FRAME_WIDTH_NONE 0 #define DETAILSLINE_WIDTH CFrameBuffer::getInstance()->scale2Res(16)