godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #51805 from skysphr/scrollbar-icons-pressed 

Added increment_pressed and decrement_pressed icons to scrollbars
This commit is contained in:
Hugo Locurcio 2021-09-13 14:57:21 +02:00 committed by GitHub
parent c7455d9d42 e27ab2708f
commit f85426e8ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/classes/HScrollBar.xml
View File

@ -19,6 +19,9 @@
<theme_item name="decrement_highlight" data_type="icon" type="Texture2D"> <theme_item name="decrement_highlight" data_type="icon" type="Texture2D">
Displayed when the mouse cursor hovers over the decrement button. Displayed when the mouse cursor hovers over the decrement button.
</theme_item> </theme_item>
<theme_item name="decrement_pressed" data_type="icon" type="Texture2D">
Displayed when the decrement button is being pressed.
</theme_item>
<theme_item name="grabber" data_type="style" type="StyleBox"> <theme_item name="grabber" data_type="style" type="StyleBox">
Used as texture for the grabber, the draggable element representing current scroll. Used as texture for the grabber, the draggable element representing current scroll.
</theme_item> </theme_item>
@ -34,6 +37,9 @@
<theme_item name="increment_highlight" data_type="icon" type="Texture2D"> <theme_item name="increment_highlight" data_type="icon" type="Texture2D">
Displayed when the mouse cursor hovers over the increment button. Displayed when the mouse cursor hovers over the increment button.
</theme_item> </theme_item>
<theme_item name="increment_pressed" data_type="icon" type="Texture2D">
Displayed when the increment button is being pressed.
</theme_item>
<theme_item name="scroll" data_type="style" type="StyleBox"> <theme_item name="scroll" data_type="style" type="StyleBox">
Used as background of this [ScrollBar]. Used as background of this [ScrollBar].
</theme_item> </theme_item>

6
doc/classes/VScrollBar.xml
View File

@ -23,6 +23,9 @@
<theme_item name="decrement_highlight" data_type="icon" type="Texture2D"> <theme_item name="decrement_highlight" data_type="icon" type="Texture2D">
Displayed when the mouse cursor hovers over the decrement button. Displayed when the mouse cursor hovers over the decrement button.
</theme_item> </theme_item>
<theme_item name="decrement_pressed" data_type="icon" type="Texture2D">
Displayed when the decrement button is being pressed.
</theme_item>
<theme_item name="grabber" data_type="style" type="StyleBox"> <theme_item name="grabber" data_type="style" type="StyleBox">
Used as texture for the grabber, the draggable element representing current scroll. Used as texture for the grabber, the draggable element representing current scroll.
</theme_item> </theme_item>
@ -38,6 +41,9 @@
<theme_item name="increment_highlight" data_type="icon" type="Texture2D"> <theme_item name="increment_highlight" data_type="icon" type="Texture2D">
Displayed when the mouse cursor hovers over the increment button. Displayed when the mouse cursor hovers over the increment button.
</theme_item> </theme_item>
<theme_item name="increment_pressed" data_type="icon" type="Texture2D">
Displayed when the increment button is being pressed.
</theme_item>
<theme_item name="scroll" data_type="style" type="StyleBox"> <theme_item name="scroll" data_type="style" type="StyleBox">
Used as background of this [ScrollBar]. Used as background of this [ScrollBar].
</theme_item> </theme_item>

4
editor/editor_themes.cpp
View File

@ -1154,8 +1154,10 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
theme->set_icon("increment", "HScrollBar", empty_icon); theme->set_icon("increment", "HScrollBar", empty_icon);
theme->set_icon("increment_highlight", "HScrollBar", empty_icon); theme->set_icon("increment_highlight", "HScrollBar", empty_icon);
theme->set_icon("increment_pressed", "HScrollBar", empty_icon);
theme->set_icon("decrement", "HScrollBar", empty_icon); theme->set_icon("decrement", "HScrollBar", empty_icon);
theme->set_icon("decrement_highlight", "HScrollBar", empty_icon); theme->set_icon("decrement_highlight", "HScrollBar", empty_icon);
theme->set_icon("decrement_pressed", "HScrollBar", empty_icon);
// VScrollBar // VScrollBar
theme->set_stylebox("scroll", "VScrollBar", make_stylebox(theme->get_icon("GuiScrollBg", "EditorIcons"), 5, 5, 5, 5, 0, 0, 0, 0)); theme->set_stylebox("scroll", "VScrollBar", make_stylebox(theme->get_icon("GuiScrollBg", "EditorIcons"), 5, 5, 5, 5, 0, 0, 0, 0));
@ -1166,8 +1168,10 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
theme->set_icon("increment", "VScrollBar", empty_icon); theme->set_icon("increment", "VScrollBar", empty_icon);
theme->set_icon("increment_highlight", "VScrollBar", empty_icon); theme->set_icon("increment_highlight", "VScrollBar", empty_icon);
theme->set_icon("increment_pressed", "VScrollBar", empty_icon);
theme->set_icon("decrement", "VScrollBar", empty_icon); theme->set_icon("decrement", "VScrollBar", empty_icon);
theme->set_icon("decrement_highlight", "VScrollBar", empty_icon); theme->set_icon("decrement_highlight", "VScrollBar", empty_icon);
theme->set_icon("decrement_pressed", "VScrollBar", empty_icon);
// HSlider // HSlider
theme->set_icon("grabber_highlight", "HSlider", theme->get_icon("GuiSliderGrabberHl", "EditorIcons")); theme->set_icon("grabber_highlight", "HSlider", theme->get_icon("GuiSliderGrabberHl", "EditorIcons"));

26
scene/gui/scroll_bar.cpp
View File

@ -80,12 +80,16 @@ void ScrollBar::gui_input(const Ref<InputEvent> &p_event) {
double total = orientation == VERTICAL ? get_size().height : get_size().width; double total = orientation == VERTICAL ? get_size().height : get_size().width;
if (ofs < decr_size) { if (ofs < decr_size) {
decr_active = true;
set_value(get_value() - (custom_step >= 0 ? custom_step : get_step())); set_value(get_value() - (custom_step >= 0 ? custom_step : get_step()));
update();
return; return;
} }
if (ofs > total - incr_size) { if (ofs > total - incr_size) {
incr_active = true;
set_value(get_value() + (custom_step >= 0 ? custom_step : get_step())); set_value(get_value() + (custom_step >= 0 ? custom_step : get_step()));
update();
return; return;
} }
@ -130,6 +134,8 @@ void ScrollBar::gui_input(const Ref<InputEvent> &p_event) {
} }
} else { } else {
incr_active = false;
decr_active = false;
drag.active = false; drag.active = false;
update(); update();
} }
@ -215,8 +221,24 @@ void ScrollBar::_notification(int p_what) {
if (p_what == NOTIFICATION_DRAW) { if (p_what == NOTIFICATION_DRAW) {
RID ci = get_canvas_item(); RID ci = get_canvas_item();
Ref<Texture2D> decr = highlight == HIGHLIGHT_DECR ? get_theme_icon(SNAME("decrement_highlight")) : get_theme_icon(SNAME("decrement")); Ref<Texture2D> decr, incr;
Ref<Texture2D> incr = highlight == HIGHLIGHT_INCR ? get_theme_icon(SNAME("increment_highlight")) : get_theme_icon(SNAME("increment"));
if (decr_active) {
decr = get_theme_icon(SNAME("decrement_pressed"));
} else if (highlight == HIGHLIGHT_DECR) {
decr = get_theme_icon(SNAME("decrement_highlight"));
} else {
decr = get_theme_icon(SNAME("decrement"));
}
if (incr_active) {
incr = get_theme_icon(SNAME("increment_pressed"));
} else if (highlight == HIGHLIGHT_INCR) {
incr = get_theme_icon(SNAME("increment_highlight"));
} else {
incr = get_theme_icon(SNAME("increment"));
}
Ref<StyleBox> bg = has_focus() ? get_theme_stylebox(SNAME("scroll_focus")) : get_theme_stylebox(SNAME("scroll")); Ref<StyleBox> bg = has_focus() ? get_theme_stylebox(SNAME("scroll_focus")) : get_theme_stylebox(SNAME("scroll"));
Ref<StyleBox> grabber; Ref<StyleBox> grabber;

3
scene/gui/scroll_bar.h
View File

@ -51,6 +51,9 @@ class ScrollBar : public Range {
HighlightStatus highlight = HIGHLIGHT_NONE; HighlightStatus highlight = HIGHLIGHT_NONE;
bool incr_active = false;
bool decr_active = false;
struct Drag { struct Drag {
bool active = false; bool active = false;
float pos_at_click = 0.0; float pos_at_click = 0.0;

4
scene/resources/default_theme/default_theme.cpp
View File

@ -502,8 +502,10 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
theme->set_icon("increment", "HScrollBar", empty_icon); theme->set_icon("increment", "HScrollBar", empty_icon);
theme->set_icon("increment_highlight", "HScrollBar", empty_icon); theme->set_icon("increment_highlight", "HScrollBar", empty_icon);
theme->set_icon("increment_pressed", "HScrollBar", empty_icon);
theme->set_icon("decrement", "HScrollBar", empty_icon); theme->set_icon("decrement", "HScrollBar", empty_icon);
theme->set_icon("decrement_highlight", "HScrollBar", empty_icon); theme->set_icon("decrement_highlight", "HScrollBar", empty_icon);
theme->set_icon("decrement_pressed", "HScrollBar", empty_icon);
// VScrollBar // VScrollBar
@ -515,8 +517,10 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
theme->set_icon("increment", "VScrollBar", empty_icon); theme->set_icon("increment", "VScrollBar", empty_icon);
theme->set_icon("increment_highlight", "VScrollBar", empty_icon); theme->set_icon("increment_highlight", "VScrollBar", empty_icon);
theme->set_icon("increment_pressed", "VScrollBar", empty_icon);
theme->set_icon("decrement", "VScrollBar", empty_icon); theme->set_icon("decrement", "VScrollBar", empty_icon);
theme->set_icon("decrement_highlight", "VScrollBar", empty_icon); theme->set_icon("decrement_highlight", "VScrollBar", empty_icon);
theme->set_icon("decrement_pressed", "VScrollBar", empty_icon);
// HSlider // HSlider