master #1

Merged
BRNSystems merged 55 commits from Mirrorlandia_minetest/minetest:master into master 2023-11-24 22:11:18 +01:00
Showing only changes of commit aa912e90a7 - Show all commits

@ -70,15 +70,15 @@ void GUIVolumeChange::regenerateGui(v2u32 screensize)
Add stuff Add stuff
*/ */
{ {
core::rect<s32> rect(0, 0, 160 * s, 20 * s); core::rect<s32> rect(0, 0, 300 * s, 20 * s);
rect = rect + v2s32(size.X / 2 - 80 * s, size.Y / 2 - 70 * s); rect = rect + v2s32(size.X / 2 - 150 * s, size.Y / 2 - 70 * s);
StaticText::add(Environment, fwgettext("Sound Volume: %d%%", volume), StaticText::add(Environment, fwgettext("Sound Volume: %d%%", volume),
rect, false, true, this, ID_soundText); rect, false, true, this, ID_soundText);
} }
{ {
core::rect<s32> rect(0, 0, 80 * s, 30 * s); core::rect<s32> rect(0, 0, 100 * s, 30 * s);
rect = rect + v2s32(size.X / 2 - 80 * s / 2, size.Y / 2 + 55 * s); rect = rect + v2s32(size.X / 2 - 100 * s / 2, size.Y / 2 + 55 * s);
GUIButton::addButton(Environment, rect, m_tsrc, this, ID_soundExitButton, GUIButton::addButton(Environment, rect, m_tsrc, this, ID_soundExitButton,
wstrgettext("Exit").c_str()); wstrgettext("Exit").c_str());
} }
@ -91,8 +91,8 @@ void GUIVolumeChange::regenerateGui(v2u32 screensize)
e->setPos(volume); e->setPos(volume);
} }
{ {
core::rect<s32> rect(0, 0, 160 * s, 20 * s); core::rect<s32> rect(0, 0, 300 * s, 20 * s);
rect = rect + v2s32(size.X / 2 - 80 * s, size.Y / 2 - 35 * s); rect = rect + v2s32(size.X / 2 - 150 * s, size.Y / 2 - 35 * s);
Environment->addCheckBox(g_settings->getBool("mute_sound"), rect, this, Environment->addCheckBox(g_settings->getBool("mute_sound"), rect, this,
ID_soundMuteButton, wstrgettext("Muted").c_str()); ID_soundMuteButton, wstrgettext("Muted").c_str());
} }