From 77edb7ca5232a333abd97ff7e5b497a0bd56ec6e Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 28 Jul 2020 00:15:35 +0200 Subject: [PATCH] psisetup: smoother view Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/f8028639b5a9146897b079c124ff554ef1cea7d5 Author: vanhofen Date: 2020-07-28 (Tue, 28 Jul 2020) Origin message was: ------------------ - psisetup: smoother view --- data/locale/deutsch.locale | 2 +- data/locale/english.locale | 2 +- src/gui/psisetup.cpp | 9 +++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 423d5fc2a..b49191d60 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -2975,7 +2975,7 @@ videomenu.pip_error PiP Startfehler videomenu.psi Farbregler videomenu.psi.brightness Helligkeit videomenu.psi.contrast Kontrast -videomenu.psi.reset Standard-Einstellungen +videomenu.psi.reset Standard videomenu.psi.saturation Sättigung videomenu.psi.step Farbregler-Schrittweite videomenu.psi.tint Farbton diff --git a/data/locale/english.locale b/data/locale/english.locale index d2dda3e8e..f82e3676e 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -2921,7 +2921,7 @@ videomenu.pip_error PiP start failed videomenu.psi Color sliders videomenu.psi.brightness Brightness videomenu.psi.contrast Contrast -videomenu.psi.reset Standard settings +videomenu.psi.reset Default videomenu.psi.saturation Saturation videomenu.psi.step Color sliders step size videomenu.psi.tint Tint diff --git a/src/gui/psisetup.cpp b/src/gui/psisetup.cpp index e0677f988..83a4386c9 100644 --- a/src/gui/psisetup.cpp +++ b/src/gui/psisetup.cpp @@ -118,7 +118,7 @@ int CPSISetup::exec (CMenuTarget * parent, const std::string &) neutrino_msg_data_t data; locWidth = 0; - for (int i = 0; i < PSI_RESET; i++) + for (int i = 0; i < PSI_SCALE_COUNT; i++) { int w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth (g_Locale->getText(psi_list[i].loc)) + OFFSET_INNER_SMALL; if (w > locWidth) @@ -158,9 +158,6 @@ int CPSISetup::exec (CMenuTarget * parent, const std::string &) psi_list[i].yLoc = psi_list[i].y + locHeight - 1; } - psi_list[PSI_RESET].xLoc = x + OFFSET_INNER_MID; - psi_list[PSI_RESET].xBox = x; - for (int i = 0; i < PSI_RESET; i++) psi_list[i].scale->reset (); @@ -284,8 +281,8 @@ void CPSISetup::paintSlider (int i) else { int fh = f->getHeight(); - f->RenderString (psi_list[i].x + OFFSET_INNER_SMALL + fh + fh/8, psi_list[i].yLoc, dx - OFFSET_INNER_SMALL - fh, g_Locale->getText(psi_list[i].loc), COL_MENUCONTENT_TEXT); - frameBuffer->paintIcon (NEUTRINO_ICON_BUTTON_RED, psi_list[i].x + OFFSET_INNER_SMALL, psi_list[i].yLoc - fh + fh/4, 0, (6 * fh)/8); + frameBuffer->paintIcon (NEUTRINO_ICON_BUTTON_RED, psi_list[i].x, psi_list[i].yLoc - fh + fh/4, 0, (6 * fh)/8); + f->RenderString (psi_list[i].xLoc, psi_list[i].yLoc, locWidth, g_Locale->getText(psi_list[i].loc), COL_MENUCONTENT_TEXT); } needsBlit = true; }