minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename guiScrollBar to GUIScrollBar

This commit is contained in:
DS-Minetest 2019-07-27 15:44:11 +02:00 committed by sfan5
parent 4aa9a669cb
commit 115ef6c09c
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/guiEditBoxWithScrollbar.cpp
View File

@ -1400,7 +1400,7 @@ void GUIEditBoxWithScrollBar::createVScrollBar()
irr::core::rect<s32> scrollbarrect = m_frame_rect; irr::core::rect<s32> scrollbarrect = m_frame_rect;
scrollbarrect.UpperLeftCorner.X += m_frame_rect.getWidth() - m_scrollbar_width; scrollbarrect.UpperLeftCorner.X += m_frame_rect.getWidth() - m_scrollbar_width;
m_vscrollbar = new guiScrollBar(Environment, getParent(), -1, m_vscrollbar = new GUIScrollBar(Environment, getParent(), -1,
scrollbarrect, false, true); scrollbarrect, false, true);
m_vscrollbar->setVisible(false); m_vscrollbar->setVisible(false);

2
src/gui/guiEditBoxWithScrollbar.h
View File

@ -187,7 +187,7 @@ protected:
core::rect<s32> m_current_text_rect, m_frame_rect; // temporary values core::rect<s32> m_current_text_rect, m_frame_rect; // temporary values
u32 m_scrollbar_width; u32 m_scrollbar_width;
guiScrollBar *m_vscrollbar; GUIScrollBar *m_vscrollbar;
bool m_writable; bool m_writable;
bool m_bg_color_used; bool m_bg_color_used;

26
src/gui/guiScrollBar.cpp
View File

@ -14,7 +14,7 @@ the arrow buttons where there is insufficient space.
#include <IGUIButton.h> #include <IGUIButton.h>
#include <IGUISkin.h> #include <IGUISkin.h>
guiScrollBar::guiScrollBar(IGUIEnvironment *environment, IGUIElement *parent, s32 id, GUIScrollBar::GUIScrollBar(IGUIEnvironment *environment, IGUIElement *parent, s32 id,
core::rect<s32> rectangle, bool horizontal, bool auto_scale) : core::rect<s32> rectangle, bool horizontal, bool auto_scale) :
IGUIElement(EGUIET_ELEMENT, environment, parent, id, rectangle), IGUIElement(EGUIET_ELEMENT, environment, parent, id, rectangle),
up_button(nullptr), down_button(nullptr), is_dragging(false), up_button(nullptr), down_button(nullptr), is_dragging(false),
@ -30,7 +30,7 @@ guiScrollBar::guiScrollBar(IGUIEnvironment *environment, IGUIElement *parent, s3
setPos(0); setPos(0);
} }
bool guiScrollBar::OnEvent(const SEvent &event) bool GUIScrollBar::OnEvent(const SEvent &event)
{ {
if (isEnabled()) { if (isEnabled()) {
switch (event.EventType) { switch (event.EventType) {
@ -193,7 +193,7 @@ bool guiScrollBar::OnEvent(const SEvent &event)
return IGUIElement::OnEvent(event); return IGUIElement::OnEvent(event);
} }
void guiScrollBar::draw() void GUIScrollBar::draw()
{ {
if (!IsVisible) if (!IsVisible)
return; return;
@ -228,14 +228,14 @@ void guiScrollBar::draw()
IGUIElement::draw(); IGUIElement::draw();
} }
void guiScrollBar::updateAbsolutePosition() void GUIScrollBar::updateAbsolutePosition()
{ {
IGUIElement::updateAbsolutePosition(); IGUIElement::updateAbsolutePosition();
refreshControls(); refreshControls();
setPos(scroll_pos); setPos(scroll_pos);
} }
s32 guiScrollBar::getPosFromMousePos(const core::position2di &pos) const s32 GUIScrollBar::getPosFromMousePos(const core::position2di &pos) const
{ {
s32 w, p; s32 w, p;
s32 offset = dragged_by_slider ? drag_offset : thumb_size / 2; s32 offset = dragged_by_slider ? drag_offset : thumb_size / 2;
@ -250,7 +250,7 @@ s32 guiScrollBar::getPosFromMousePos(const core::position2di &pos) const
return core::isnotzero(range()) ? s32(f32(p) / f32(w) * range()) + min_pos : 0; return core::isnotzero(range()) ? s32(f32(p) / f32(w) * range()) + min_pos : 0;
} }
void guiScrollBar::setPos(const s32 &pos) void GUIScrollBar::setPos(const s32 &pos)
{ {
s32 thumb_area = 0; s32 thumb_area = 0;
s32 thumb_min = 0; s32 thumb_min = 0;
@ -275,17 +275,17 @@ void guiScrollBar::setPos(const s32 &pos)
draw_center = s32((f32(scroll_pos) * f) + (f32(thumb_size) * 0.5f)) + border_size; draw_center = s32((f32(scroll_pos) * f) + (f32(thumb_size) * 0.5f)) + border_size;
} }
void guiScrollBar::setSmallStep(const s32 &step) void GUIScrollBar::setSmallStep(const s32 &step)
{ {
small_step = step > 0 ? step : 10; small_step = step > 0 ? step : 10;
} }
void guiScrollBar::setLargeStep(const s32 &step) void GUIScrollBar::setLargeStep(const s32 &step)
{ {
large_step = step > 0 ? step : 50; large_step = step > 0 ? step : 50;
} }
void guiScrollBar::setMax(const s32 &max) void GUIScrollBar::setMax(const s32 &max)
{ {
max_pos = max; max_pos = max;
if (min_pos > max_pos) if (min_pos > max_pos)
@ -297,7 +297,7 @@ void guiScrollBar::setMax(const s32 &max)
setPos(scroll_pos); setPos(scroll_pos);
} }
void guiScrollBar::setMin(const s32 &min) void GUIScrollBar::setMin(const s32 &min)
{ {
min_pos = min; min_pos = min;
if (max_pos < min_pos) if (max_pos < min_pos)
@ -309,18 +309,18 @@ void guiScrollBar::setMin(const s32 &min)
setPos(scroll_pos); setPos(scroll_pos);
} }
void guiScrollBar::setPageSize(const s32 &size) void GUIScrollBar::setPageSize(const s32 &size)
{ {
page_size = size; page_size = size;
setPos(scroll_pos); setPos(scroll_pos);
} }
s32 guiScrollBar::getPos() const s32 GUIScrollBar::getPos() const
{ {
return scroll_pos; return scroll_pos;
} }
void guiScrollBar::refreshControls() void GUIScrollBar::refreshControls()
{ {
IGUISkin *skin = Environment->getSkin(); IGUISkin *skin = Environment->getSkin();
IGUISpriteBank *sprites = nullptr; IGUISpriteBank *sprites = nullptr;

4
src/gui/guiScrollBar.h
View File

@ -17,10 +17,10 @@ the arrow buttons where there is insufficient space.
using namespace irr; using namespace irr;
using namespace gui; using namespace gui;
class guiScrollBar : public IGUIElement class GUIScrollBar : public IGUIElement
{ {
public: public:
guiScrollBar(IGUIEnvironment *environment, IGUIElement *parent, s32 id, GUIScrollBar(IGUIEnvironment *environment, IGUIElement *parent, s32 id,
core::rect<s32> rectangle, bool horizontal, bool auto_scale); core::rect<s32> rectangle, bool horizontal, bool auto_scale);
virtual void draw(); virtual void draw();

2
src/gui/guiTable.cpp
View File

@ -61,7 +61,7 @@ GUITable::GUITable(gui::IGUIEnvironment *env,
} }
const s32 s = skin->getSize(gui::EGDS_SCROLLBAR_SIZE); const s32 s = skin->getSize(gui::EGDS_SCROLLBAR_SIZE);
m_scrollbar = new guiScrollBar(Environment, this, -1, m_scrollbar = new GUIScrollBar(Environment, this, -1,
core::rect<s32>(RelativeRect.getWidth() - s, core::rect<s32>(RelativeRect.getWidth() - s,
0, 0,
RelativeRect.getWidth(), RelativeRect.getWidth(),

2
src/gui/guiTable.h
View File

@ -199,7 +199,7 @@ protected:
video::SColor m_highlight_text = video::SColor(255, 255, 255, 255); video::SColor m_highlight_text = video::SColor(255, 255, 255, 255);
s32 m_rowheight = 1; s32 m_rowheight = 1;
gui::IGUIFont *m_font = nullptr; gui::IGUIFont *m_font = nullptr;
guiScrollBar *m_scrollbar = nullptr; GUIScrollBar *m_scrollbar = nullptr;
// Allocated strings and images // Allocated strings and images
std::vector<core::stringw> m_strings; std::vector<core::stringw> m_strings;

2
src/gui/intlGUIEditBox.cpp
View File

@ -1482,7 +1482,7 @@ void intlGUIEditBox::createVScrollBar()
irr::core::rect<s32> scrollbarrect = FrameRect; irr::core::rect<s32> scrollbarrect = FrameRect;
scrollbarrect.UpperLeftCorner.X += FrameRect.getWidth() - m_scrollbar_width; scrollbarrect.UpperLeftCorner.X += FrameRect.getWidth() - m_scrollbar_width;
m_vscrollbar = new guiScrollBar(Environment, getParent(), -1, m_vscrollbar = new GUIScrollBar(Environment, getParent(), -1,
scrollbarrect, false, true); scrollbarrect, false, true);
m_vscrollbar->setVisible(false); m_vscrollbar->setVisible(false);

2
src/gui/intlGUIEditBox.h
View File

@ -198,7 +198,7 @@ namespace gui
core::rect<s32> CurrentTextRect = core::rect<s32>(0,0,1,1); core::rect<s32> CurrentTextRect = core::rect<s32>(0,0,1,1);
core::rect<s32> FrameRect; // temporary values core::rect<s32> FrameRect; // temporary values
u32 m_scrollbar_width; u32 m_scrollbar_width;
guiScrollBar *m_vscrollbar; GUIScrollBar *m_vscrollbar;
bool m_writable; bool m_writable;
}; };