From 712ee698ec39a2fabff899a38a0f65a3d0b9ece0 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Sat, 30 Apr 2022 16:31:45 +0200 Subject: [PATCH] fix typo / add default progressbar width Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/0924849d6ff8dfbf24e09fc135673a39f57bb6e2 Author: TangoCash Date: 2022-04-30 (Sat, 30 Apr 2022) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/components/cc_frm_header.cpp | 2 +- src/gui/components/cc_frm_slider.h | 2 +- src/system/settings.h | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gui/components/cc_frm_header.cpp b/src/gui/components/cc_frm_header.cpp index f5f762bc8..5ecb47124 100644 --- a/src/gui/components/cc_frm_header.cpp +++ b/src/gui/components/cc_frm_header.cpp @@ -173,7 +173,7 @@ void CComponentsHeader::initVarHeader( const int& x_pos, const int& y_pos, const cch_cl_enable_run = false; cch_pb_x = cch_offset; - cch_pb_w = 100; + cch_pb_w = PROGRESSBAR_WIDTH; cch_pb_percent = 0; cch_pb_enable = false; diff --git a/src/gui/components/cc_frm_slider.h b/src/gui/components/cc_frm_slider.h index 141091dea..bc7624274 100644 --- a/src/gui/components/cc_frm_slider.h +++ b/src/gui/components/cc_frm_slider.h @@ -58,7 +58,7 @@ class CComponentsSlider : public CComponentsForm void initCCSlItems(); public: - CComponentsSlider( const int& x_pos = 0, const int& y_pos = 0, const int& w = SLIDER_WIDHT, const int& h = SLIDER_HEIGHT, + CComponentsSlider( const int& x_pos = 0, const int& y_pos = 0, const int& w = SLIDER_WIDTH, const int& h = SLIDER_HEIGHT, const int& current_value = 0, const int& max_value = 100, CComponentsForm *parent = NULL, diff --git a/src/system/settings.h b/src/system/settings.h index e7f6a5fc7..990907b3a 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -1380,7 +1380,9 @@ const time_settings_struct_t handling_infobar_setting[SNeutrinoSettings::HANDLIN #define SIDEBAR_WIDTH CFrameBuffer::getInstance()->scale2Res(40) #define SLIDER_HEIGHT CFrameBuffer::getInstance()->scale2Res(22) -#define SLIDER_WIDHT CFrameBuffer::getInstance()->scale2Res(120) +#define SLIDER_WIDTH CFrameBuffer::getInstance()->scale2Res(120) + +#define PROGRESSBAR_WIDTH CFrameBuffer::getInstance()->scale2Res(100) #define BIGFONT_FACTOR 1.5