Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-23 16:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace any uses of CGUIScrollBar and IGUIScrollBar with GUIScrollBar

Browse Source
This commit is contained in:
Desour 2023-08-09 00:06:38 +02:00 committed by sfan5
parent 124d064015
commit 9d62abbe46
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/guiTable.cpp
View File

@ -901,7 +901,7 @@ bool GUITable::OnEvent(const SEvent &event)
setToolTipText(cell ? m_strings[cell->tooltip_index].c_str() : L""); setToolTipText(cell ? m_strings[cell->tooltip_index].c_str() : L"");
// Fix for #1567/#1806: // Fix for #1567/#1806:
// IGUIScrollBar passes double click events to its parent, // GUIScrollBar passes double click events to its parent,
// which we don't want. Detect this case and discard the event // which we don't want. Detect this case and discard the event
if (event.MouseInput.Event != EMIE_MOUSE_MOVED && if (event.MouseInput.Event != EMIE_MOUSE_MOVED &&
m_scrollbar->isVisible() && m_scrollbar->isVisible() &&

8
src/gui/guiVolumeChange.cpp
View File

@ -20,11 +20,11 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "guiVolumeChange.h" #include "guiVolumeChange.h"
#include "debug.h" #include "debug.h"
#include "guiButton.h" #include "guiButton.h"
#include "guiScrollBar.h"
#include "serialization.h" #include "serialization.h"
#include <string> #include <string>
#include <IGUICheckBox.h> #include <IGUICheckBox.h>
#include <IGUIButton.h> #include <IGUIButton.h>
#include <IGUIScrollBar.h>
#include <IGUIStaticText.h> #include <IGUIStaticText.h>
#include <IGUIFont.h> #include <IGUIFont.h>
#include "settings.h" #include "settings.h"
@ -85,8 +85,8 @@ void GUIVolumeChange::regenerateGui(v2u32 screensize)
{ {
core::rect<s32> rect(0, 0, 300 * s, 20 * s); core::rect<s32> rect(0, 0, 300 * s, 20 * s);
rect = rect + v2s32(size.X / 2 - 150 * s, size.Y / 2); rect = rect + v2s32(size.X / 2 - 150 * s, size.Y / 2);
gui::IGUIScrollBar *e = Environment->addScrollBar(true, auto e = make_irr<GUIScrollBar>(Environment, this,
rect, this, ID_soundSlider); ID_soundSlider, rect, true, false);
e->setMax(100); e->setMax(100);
e->setPos(volume); e->setPos(volume);
} }
@ -151,7 +151,7 @@ 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 = static_cast<GUIScrollBar *>(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_soundText); gui::IGUIElement *e = getElementFromId(ID_soundText);