mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 02:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

CColorChooser: fix compile conversion warnings

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3b5cd00bf4
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-14 (Tue, 14 Mar 2017)

Origin message was:
------------------
CColorChooser: fix compile conversion warnings

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2017-03-14 08:16:12 +01:00
parent 8315062d3f
commit 054d0c33bf
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,6 +158,7 @@ int CColorChooser::exec(CMenuTarget* parent, const std::string &)
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings
::TIMING_MENU]); ::TIMING_MENU]);
int val = (*value[selected]);
switch ( msg ) { switch ( msg ) {
case CRCInput::RC_down: case CRCInput::RC_down:
{ {
@@ -190,12 +191,12 @@ int CColorChooser::exec(CMenuTarget* parent, const std::string &)
} }
case CRCInput::RC_right: case CRCInput::RC_right:
{ {
if ((*value[selected]) < 100) if (val < 100)
{ {
if ((*value[selected]) < 98) if (val < 98)
(*value[selected]) += 2; val += 2;
else else
(*value[selected]) = 100; val = 100;
paintSlider(x + 10, y + hheight + mheight * selected, value[selected], colorchooser_names[selected], iconnames[selected], true); paintSlider(x + 10, y + hheight + mheight * selected, value[selected], colorchooser_names[selected], iconnames[selected], true);
setColor(); setColor();
@@ -204,12 +205,12 @@ int CColorChooser::exec(CMenuTarget* parent, const std::string &)
} }
case CRCInput::RC_left: case CRCInput::RC_left:
{ {
if ((*value[selected]) > 0) if (val > 0)
{ {
if ((*value[selected]) > 2) if (val > 2)
(*value[selected]) -= 2; val -= 2;
else else
(*value[selected]) = 0; val = 0;
paintSlider(x + 10, y + hheight + mheight * selected, value[selected], colorchooser_names[selected], iconnames[selected], true); paintSlider(x + 10, y + hheight + mheight * selected, value[selected], colorchooser_names[selected], iconnames[selected], true);
setColor(); setColor();