BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

guiVolumeChange: prevent wrong value position by using 1 label instead of 2 (#5839)

Browse Source 
* Use only one label instead of two for the soundText, this permit to ensure both label & values are aligned
* Add '%' character too, to reflect it's a percentage volume
* Remove rect on regenerateGui (upper part) which shadows outer part and which is not needed outside of the DesiredRect affectation

Fix issue #5837
This commit is contained in:
Loïc Blot 2017-05-28 15:23:30 +02:00 committed by GitHub
parent c09e16ff5b
commit ef152428ef
1 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/guiVolumeChange.cpp
View File

@ -30,10 +30,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "gettext.h" #include "gettext.h"
const int ID_soundText1 = 263; const int ID_soundText = 263;
const int ID_soundText2 = 264; const int ID_soundExitButton = 264;
const int ID_soundExitButton = 265; const int ID_soundSlider = 265;
const int ID_soundSlider = 266;
GUIVolumeChange::GUIVolumeChange(gui::IGUIEnvironment* env, GUIVolumeChange::GUIVolumeChange(gui::IGUIEnvironment* env,
gui::IGUIElement* parent, s32 id, gui::IGUIElement* parent, s32 id,
@ -50,10 +49,7 @@ GUIVolumeChange::~GUIVolumeChange()
void GUIVolumeChange::removeChildren() void GUIVolumeChange::removeChildren()
{ {
if (gui::IGUIElement *e = getElementFromId(ID_soundText1)) if (gui::IGUIElement *e = getElementFromId(ID_soundText))
e->remove();
if (gui::IGUIElement *e = getElementFromId(ID_soundText2))
e->remove(); e->remove();
if (gui::IGUIElement *e = getElementFromId(ID_soundExitButton)) if (gui::IGUIElement *e = getElementFromId(ID_soundExitButton))
@ -73,34 +69,31 @@ void GUIVolumeChange::regenerateGui(v2u32 screensize)
/* /*
Calculate new sizes and positions Calculate new sizes and positions
*/ */
core::rect<s32> rect( DesiredRect = core::rect<s32>(
screensize.X/2 - 380/2, screensize.X/2 - 380/2,
screensize.Y/2 - 200/2, screensize.Y/2 - 200/2,
screensize.X/2 + 380/2, screensize.X/2 + 380/2,
screensize.Y/2 + 200/2 screensize.Y/2 + 200/2
); );
DesiredRect = rect;
recalculateAbsolutePosition(false); recalculateAbsolutePosition(false);
v2s32 size = rect.getSize(); v2s32 size = DesiredRect.getSize();
int volume = (int)(g_settings->getFloat("sound_volume")*100); int volume = (int)(g_settings->getFloat("sound_volume") * 100);
/* /*
Add stuff Add stuff
*/ */
{ {
core::rect<s32> rect(0, 0, 120, 20); core::rect<s32> rect(0, 0, 160, 20);
rect = rect + v2s32(size.X/2-60, size.Y/2-35); rect = rect + v2s32(size.X / 2 - 80, size.Y / 2 - 35);
const wchar_t *text = wgettext("Sound Volume: "); const wchar_t *text = wgettext("Sound Volume: ");
Environment->addStaticText(text, rect, false, core::stringw volume_text = text;
true, this, ID_soundText1); delete [] text;
delete[] text;
} volume_text += core::stringw(volume) + core::stringw("%");
{ Environment->addStaticText(volume_text.c_str(), rect, false,
core::rect<s32> rect(0, 0, 30, 20); true, this, ID_soundText);
rect = rect + v2s32(size.X/2+40, size.Y/2-35);
Environment->addStaticText(core::stringw(volume).c_str(), rect, false,
true, this, ID_soundText2);
} }
{ {
core::rect<s32> rect(0, 0, 80, 30); core::rect<s32> rect(0, 0, 80, 30);
@ -155,10 +148,15 @@ bool GUIVolumeChange::OnEvent(const SEvent& event)
if (event.GUIEvent.EventType == gui::EGET_SCROLL_BAR_CHANGED) { if (event.GUIEvent.EventType == gui::EGET_SCROLL_BAR_CHANGED) {
if (event.GUIEvent.Caller->getID() == ID_soundSlider) { if (event.GUIEvent.Caller->getID() == ID_soundSlider) {
s32 pos = ((gui::IGUIScrollBar*)event.GUIEvent.Caller)->getPos(); s32 pos = ((gui::IGUIScrollBar*)event.GUIEvent.Caller)->getPos();
g_settings->setFloat("sound_volume", (float)pos/100); g_settings->setFloat("sound_volume", (float) pos / 100);
gui::IGUIElement *e = getElementFromId(ID_soundText2); gui::IGUIElement *e = getElementFromId(ID_soundText);
e->setText(core::stringw(pos).c_str()); const wchar_t *text = wgettext("Sound Volume: ");
core::stringw volume_text = text;
delete [] text;
volume_text += core::stringw(pos) + core::stringw("%");
e->setText(volume_text.c_str());
return true; return true;
} }
} }