Merge pull request #509 from OpenVicProject/refactor_scrollbar

Refactor scrollbar

Author: wvpm

extension/doc_classes/GUIScrollbar.xml

@@ -19,7 +19,6 @@
 		</method>
 		<method name="decrement_value">
 			<return type="void" />
-			<param index="0" name="signal" type="bool" default="true" />
 			<description>
 			</description>
 		</method>
@@ -38,31 +37,11 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_max_value" qualifiers="const">
-			<return type="int" />
-			<description>
-			</description>
-		</method>
-		<method name="get_min_value" qualifiers="const">
-			<return type="int" />
-			<description>
-			</description>
-		</method>
 		<method name="get_orientation" qualifiers="const">
 			<return type="int" enum="Orientation" />
 			<description>
 			</description>
 		</method>
-		<method name="get_range_limit_max" qualifiers="const">
-			<return type="int" />
-			<description>
-			</description>
-		</method>
-		<method name="get_range_limit_min" qualifiers="const">
-			<return type="int" />
-			<description>
-			</description>
-		</method>
 		<method name="get_value" qualifiers="const">
 			<return type="int" />
 			<description>
@@ -80,7 +59,6 @@
 		</method>
 		<method name="increment_value">
 			<return type="void" />
-			<param index="0" name="signal" type="bool" default="true" />
 			<description>
 			</description>
 		</method>
@@ -90,7 +68,7 @@
 			</description>
 		</method>
 		<method name="reset">
-			<return type="int" enum="Error" />
+			<return type="void" />
 			<description>
 			</description>
 		</method>
@@ -107,28 +85,9 @@
 			<description>
 			</description>
 		</method>
-		<method name="set_limits">
-			<return type="int" enum="Error" />
-			<param index="0" name="new_min_value" type="int" />
-			<param index="1" name="new_max_value" type="int" />
-			<param index="2" name="signal" type="bool" default="true" />
-			<description>
-			</description>
-		</method>
-		<method name="set_range_limits">
-			<return type="int" enum="Error" />
-			<param index="0" name="new_range_limit_min" type="int" />
-			<param index="1" name="new_range_limit_max" type="int" />
-			<param index="2" name="signal" type="bool" default="true" />
-			<description>
-			</description>
-		</method>
-		<method name="set_range_limits_and_value">
-			<return type="int" enum="Error" />
-			<param index="0" name="new_range_limit_min" type="int" />
-			<param index="1" name="new_range_limit_max" type="int" />
-			<param index="2" name="new_value" type="int" />
-			<param index="3" name="signal" type="bool" default="true" />
+		<method name="set_step_count">
+			<return type="void" />
+			<param index="0" name="new_step_count" type="int" />
 			<description>
 			</description>
 		</method>
@@ -142,14 +101,12 @@
 		<method name="set_value">
 			<return type="void" />
 			<param index="0" name="new_value" type="int" />
-			<param index="1" name="signal" type="bool" default="true" />
 			<description>
 			</description>
 		</method>
 		<method name="set_value_as_ratio">
 			<return type="void" />
 			<param index="0" name="new_ratio" type="float" />
-			<param index="1" name="signal" type="bool" default="true" />
 			<description>
 			</description>
 		</method>

extension/src/openvic-extension/classes/GUIListBox.cpp

@@ -63,7 +63,11 @@ Error GUIListBox::_calculate_max_scroll_index(bool signal) {
 
 	ERR_FAIL_NULL_V(scrollbar, FAILED);
 
-	scrollbar->set_limits(0, max_scroll_index, false);
+	const bool was_blocking_signals = scrollbar->is_blocking_signals();
+	scrollbar->set_block_signals(true);
+	scrollbar->set_step_count(max_scroll_index);
+	scrollbar->set_block_signals(was_blocking_signals);
+
 	scrollbar->set_visible(max_scroll_index > 0);
 
 	set_scroll_index(scrollbar->get_value(), signal);
@@ -209,7 +213,10 @@ void GUIListBox::set_scroll_index(int32_t new_scroll_index, bool signal) {
 	scroll_index = std::clamp(new_scroll_index, 0, max_scroll_index);
 
 	if (scrollbar != nullptr && scrollbar->get_value() != scroll_index) {
-		scrollbar->set_value(scroll_index, false);
+		const bool was_blocking_signals = scrollbar->is_blocking_signals();
+		scrollbar->set_block_signals(true);
+		scrollbar->set_value(scroll_index);
+		scrollbar->set_block_signals(was_blocking_signals);
 	}
 
 	if (signal && scroll_index != old_scroll_index) {