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

Merge branch 'master' into pu/fb-setmode

Browse Source
This commit is contained in:
M. Liebmann
2017-03-14 17:33:57 +01:00
parent f5f2bf92ba 3b5cd00bf4
commit 49737c5ee2
3 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -3,6 +3,7 @@ Makefile
autom4te.cache
*.in
aclocal.m4
compile
config.*
configure
depcomp

12
.svnignore
View File

@@ -1,12 +0,0 @@
autom4te.cache
*.in
aclocal.m4
config.*
configure
depcomp
install-sh
*.pc
libtool
ltmain.sh
missing
stamp.h1

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