diff options
| author | kobewi <kobewi4e@gmail.com> | 2023-09-26 23:52:16 +0200 |
|---|---|---|
| committer | kobewi <kobewi4e@gmail.com> | 2023-09-27 00:06:15 +0200 |
| commit | cfb6d25d30133409a78dbfefa47d1f48e7a52e8c (patch) | |
| tree | 704527d313599d34297f100e435f3652c2988da0 | |
| parent | 251fb83d536a96110790bbf85b3fa50e5a8e2b7c (diff) | |
| download | redot-engine-cfb6d25d30133409a78dbfefa47d1f48e7a52e8c.tar.gz | |
Document, cleanup and fix some theme properties
| -rw-r--r-- | doc/classes/Button.xml | 1 | ||||
| -rw-r--r-- | doc/classes/GraphEdit.xml | 3 | ||||
| -rw-r--r-- | doc/classes/ScrollBar.xml | 2 | ||||
| -rw-r--r-- | scene/gui/graph_edit.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/scroll_bar.cpp | 17 | ||||
| -rw-r--r-- | scene/gui/scroll_bar.h | 1 |
6 files changed, 4 insertions, 22 deletions
diff --git a/doc/classes/Button.xml b/doc/classes/Button.xml index bee0cbcf4a..c6ecbc26f8 100644 --- a/doc/classes/Button.xml +++ b/doc/classes/Button.xml @@ -132,6 +132,7 @@ Font size of the [Button]'s text. </theme_item> <theme_item name="icon" data_type="icon" type="Texture2D"> + Default icon for the [Button]. Appears only if [member icon] is not assigned. </theme_item> <theme_item name="disabled" data_type="style" type="StyleBox"> [StyleBox] used when the [Button] is disabled. diff --git a/doc/classes/GraphEdit.xml b/doc/classes/GraphEdit.xml index baa591fd66..f05557861a 100644 --- a/doc/classes/GraphEdit.xml +++ b/doc/classes/GraphEdit.xml @@ -214,7 +214,7 @@ <param index="3" name="to_port" type="int" /> <param index="4" name="amount" type="float" /> <description> - Sets the coloration of the connection between [param from_node]'s [param from_port] and [param to_node]'s [param to_port] with the color provided in the [theme_item activity] theme property. + Sets the coloration of the connection between [param from_node]'s [param from_port] and [param to_node]'s [param to_port] with the color provided in the [theme_item activity] theme property. The color is linearly interpolated between the connection color and the activity color using [param amount] as weight. </description> </method> <method name="set_selected"> @@ -396,6 +396,7 @@ </constants> <theme_items> <theme_item name="activity" data_type="color" type="Color" default="Color(1, 1, 1, 1)"> + Color of the connection's activity (see [method set_connection_activity]). </theme_item> <theme_item name="grid_major" data_type="color" type="Color" default="Color(1, 1, 1, 0.2)"> Color of major grid lines. diff --git a/doc/classes/ScrollBar.xml b/doc/classes/ScrollBar.xml index e8d2753a9a..4ee05632a5 100644 --- a/doc/classes/ScrollBar.xml +++ b/doc/classes/ScrollBar.xml @@ -49,8 +49,6 @@ <theme_item name="grabber_pressed" data_type="style" type="StyleBox"> Used when the grabber is being dragged. </theme_item> - <theme_item name="hscroll" data_type="style" type="StyleBox"> - </theme_item> <theme_item name="scroll" data_type="style" type="StyleBox"> Used as background of this [ScrollBar]. </theme_item> diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp index 6e12e7f196..9839e631bf 100644 --- a/scene/gui/graph_edit.cpp +++ b/scene/gui/graph_edit.cpp @@ -1402,7 +1402,7 @@ void GraphEdit::_zoom_callback(float p_zoom_factor, Vector2 p_origin, Ref<InputE void GraphEdit::set_connection_activity(const StringName &p_from, int p_from_port, const StringName &p_to, int p_to_port, float p_activity) { for (Connection &E : connections) { if (E.from_node == p_from && E.from_port == p_from_port && E.to_node == p_to && E.to_port == p_to_port) { - if (Math::is_equal_approx(E.activity, p_activity)) { + if (!Math::is_equal_approx(E.activity, p_activity)) { // Update only if changed. top_layer->queue_redraw(); minimap->queue_redraw(); diff --git a/scene/gui/scroll_bar.cpp b/scene/gui/scroll_bar.cpp index 2931b5be91..1310cac2c7 100644 --- a/scene/gui/scroll_bar.cpp +++ b/scene/gui/scroll_bar.cpp @@ -468,22 +468,6 @@ double ScrollBar::get_area_size() const { } } -double ScrollBar::get_area_offset() const { - double ofs = 0.0; - - if (orientation == VERTICAL) { - ofs += theme_cache.scroll_offset_style->get_margin(SIDE_TOP); - ofs += theme_cache.decrement_icon->get_height(); - } - - if (orientation == HORIZONTAL) { - ofs += theme_cache.scroll_offset_style->get_margin(SIDE_LEFT); - ofs += theme_cache.decrement_icon->get_width(); - } - - return ofs; -} - double ScrollBar::get_grabber_offset() const { return (get_area_size()) * get_as_ratio(); } @@ -639,7 +623,6 @@ void ScrollBar::_bind_methods() { BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_STYLEBOX, ScrollBar, scroll_style, "scroll"); BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_STYLEBOX, ScrollBar, scroll_focus_style, "scroll_focus"); - BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_STYLEBOX, ScrollBar, scroll_offset_style, "hscroll"); BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_STYLEBOX, ScrollBar, grabber_style, "grabber"); BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_STYLEBOX, ScrollBar, grabber_hl_style, "grabber_highlight"); BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_STYLEBOX, ScrollBar, grabber_pressed_style, "grabber_pressed"); diff --git a/scene/gui/scroll_bar.h b/scene/gui/scroll_bar.h index aacf2060b8..deadbb53d6 100644 --- a/scene/gui/scroll_bar.h +++ b/scene/gui/scroll_bar.h @@ -63,7 +63,6 @@ class ScrollBar : public Range { double get_grabber_size() const; double get_grabber_min_size() const; double get_area_size() const; - double get_area_offset() const; double get_grabber_offset() const; static void set_can_focus_by_default(bool p_can_focus); |