diff --git a/doc/classes/Button.xml b/doc/classes/Button.xml
index bee0cbcf4a5..c6ecbc26f80 100644
--- a/doc/classes/Button.xml
+++ b/doc/classes/Button.xml
@@ -132,6 +132,7 @@
Font size of the [Button]'s text.
+ Default icon for the [Button]. Appears only if [member icon] is not assigned.
[StyleBox] used when the [Button] is disabled.
diff --git a/doc/classes/GraphEdit.xml b/doc/classes/GraphEdit.xml
index baa591fd66b..f05557861a4 100644
--- a/doc/classes/GraphEdit.xml
+++ b/doc/classes/GraphEdit.xml
@@ -214,7 +214,7 @@
- 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.
@@ -396,6 +396,7 @@
+ Color of the connection's activity (see [method set_connection_activity]).
Color of major grid lines.
diff --git a/doc/classes/ScrollBar.xml b/doc/classes/ScrollBar.xml
index e8d2753a9a2..4ee05632a59 100644
--- a/doc/classes/ScrollBar.xml
+++ b/doc/classes/ScrollBar.xml
@@ -49,8 +49,6 @@
Used when the grabber is being dragged.
-
-
Used as background of this [ScrollBar].
diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp
index 6e12e7f1960..9839e631bf0 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, Refqueue_redraw();
minimap->queue_redraw();
diff --git a/scene/gui/scroll_bar.cpp b/scene/gui/scroll_bar.cpp
index 2931b5be917..1310cac2c79 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 aacf2060b89..deadbb53d6a 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);