asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #63013 from aaronfranke/double-slider-box

Browse source
This commit is contained in:
Rémi Verschelde 2022-07-15 23:20:22 +02:00 committed by GitHub
commit ae5668f81e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scene/gui/slider.cpp
View file

@ -96,15 +96,15 @@ void Slider::gui_input(const Ref<InputEvent> &p_event) {
if (grab.active) { if (grab.active) {
Size2i size = get_size(); Size2i size = get_size();
Ref<Texture2D> grabber = get_theme_icon(SNAME("grabber")); Ref<Texture2D> grabber = get_theme_icon(SNAME("grabber"));
float motion = (orientation == VERTICAL ? mm->get_position().y : mm->get_position().x) - grab.pos; double motion = (orientation == VERTICAL ? mm->get_position().y : mm->get_position().x) - grab.pos;
if (orientation == VERTICAL) { if (orientation == VERTICAL) {
motion = -motion; motion = -motion;
} }
float areasize = orientation == VERTICAL ? size.height - grabber->get_size().height : size.width - grabber->get_size().width; double areasize = orientation == VERTICAL ? size.height - grabber->get_size().height : size.width - grabber->get_size().width;
if (areasize <= 0) { if (areasize <= 0) {
return; return;
} }
float umotion = motion / float(areasize); double umotion = motion / double(areasize);
set_as_ratio(grab.uvalue + umotion); set_as_ratio(grab.uvalue + umotion);
} }
} }
@ -180,7 +180,7 @@ void Slider::_notification(int p_what) {
if (orientation == VERTICAL) { if (orientation == VERTICAL) {
int widget_width = style->get_minimum_size().width + style->get_center_size().width; int widget_width = style->get_minimum_size().width + style->get_center_size().width;
float areasize = size.height - grabber->get_size().height; double areasize = size.height - grabber->get_size().height;
style->draw(ci, Rect2i(Point2i(size.width / 2 - widget_width / 2, 0), Size2i(widget_width, size.height))); style->draw(ci, Rect2i(Point2i(size.width / 2 - widget_width / 2, 0), Size2i(widget_width, size.height)));
grabber_area->draw(ci, Rect2i(Point2i((size.width - widget_width) / 2, size.height - areasize * ratio - grabber->get_size().height / 2), Size2i(widget_width, areasize * ratio + grabber->get_size().height / 2))); grabber_area->draw(ci, Rect2i(Point2i((size.width - widget_width) / 2, size.height - areasize * ratio - grabber->get_size().height / 2), Size2i(widget_width, areasize * ratio + grabber->get_size().height / 2)));
@ -197,7 +197,7 @@ void Slider::_notification(int p_what) {
grabber->draw(ci, Point2i(size.width / 2 - grabber->get_size().width / 2, size.height - ratio * areasize - grabber->get_size().height)); grabber->draw(ci, Point2i(size.width / 2 - grabber->get_size().width / 2, size.height - ratio * areasize - grabber->get_size().height));
} else { } else {
int widget_height = style->get_minimum_size().height + style->get_center_size().height; int widget_height = style->get_minimum_size().height + style->get_center_size().height;
float areasize = size.width - grabber->get_size().width; double areasize = size.width - grabber->get_size().width;
style->draw(ci, Rect2i(Point2i(0, (size.height - widget_height) / 2), Size2i(size.width, widget_height))); style->draw(ci, Rect2i(Point2i(0, (size.height - widget_height) / 2), Size2i(size.width, widget_height)));
grabber_area->draw(ci, Rect2i(Point2i(0, (size.height - widget_height) / 2), Size2i(areasize * ratio + grabber->get_size().width / 2, widget_height))); grabber_area->draw(ci, Rect2i(Point2i(0, (size.height - widget_height) / 2), Size2i(areasize * ratio + grabber->get_size().width / 2, widget_height)));
@ -218,11 +218,11 @@ void Slider::_notification(int p_what) {
} }
} }
void Slider::set_custom_step(float p_custom_step) { void Slider::set_custom_step(double p_custom_step) {
custom_step = p_custom_step; custom_step = p_custom_step;
} }
float Slider::get_custom_step() const { double Slider::get_custom_step() const {
return custom_step; return custom_step;
} }

8
scene/gui/slider.h
View file

@ -38,14 +38,14 @@ class Slider : public Range {
struct Grab { struct Grab {
int pos = 0; int pos = 0;
float uvalue = 0.0; double uvalue = 0.0;
bool active = false; bool active = false;
} grab; } grab;
int ticks = 0; int ticks = 0;
bool mouse_inside = false; bool mouse_inside = false;
Orientation orientation; Orientation orientation;
float custom_step = -1.0; double custom_step = -1.0;
bool editable = true; bool editable = true;
bool scrollable = true; bool scrollable = true;
@ -58,8 +58,8 @@ protected:
public: public:
virtual Size2 get_minimum_size() const override; virtual Size2 get_minimum_size() const override;
void set_custom_step(float p_custom_step); void set_custom_step(double p_custom_step);
float get_custom_step() const; double get_custom_step() const;
void set_ticks(int p_count); void set_ticks(int p_count);
int get_ticks() const; int get_ticks() const;

2
scene/gui/spin_box.cpp
View file

@ -167,7 +167,7 @@ void SpinBox::gui_input(const Ref<InputEvent> &p_event) {
if (mm.is_valid() && (mm->get_button_mask() & MouseButton::MASK_LEFT) != MouseButton::NONE) { if (mm.is_valid() && (mm->get_button_mask() & MouseButton::MASK_LEFT) != MouseButton::NONE) {
if (drag.enabled) { if (drag.enabled) {
drag.diff_y += mm->get_relative().y; drag.diff_y += mm->get_relative().y;
float diff_y = -0.01 * Math::pow(ABS(drag.diff_y), 1.8f) * SIGN(drag.diff_y); double diff_y = -0.01 * Math::pow(ABS(drag.diff_y), 1.8) * SIGN(drag.diff_y);
set_value(CLAMP(drag.base_val + get_step() * diff_y, get_min(), get_max())); set_value(CLAMP(drag.base_val + get_step() * diff_y, get_min(), get_max()));
} else if (drag.allowed && drag.capture_pos.distance_to(mm->get_position()) > 2) { } else if (drag.allowed && drag.capture_pos.distance_to(mm->get_position()) > 2) {
Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_CAPTURED); Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_CAPTURED);

4
scene/gui/spin_box.h
View file

@ -56,11 +56,11 @@ class SpinBox : public Range {
void _line_edit_input(const Ref<InputEvent> &p_event); void _line_edit_input(const Ref<InputEvent> &p_event);
struct Drag { struct Drag {
float base_val = 0.0; double base_val = 0.0;
bool allowed = false; bool allowed = false;
bool enabled = false; bool enabled = false;
Vector2 capture_pos; Vector2 capture_pos;
float diff_y = 0.0; double diff_y = 0.0;
} drag; } drag;
void _line_edit_focus_exit(); void _line_edit_focus_exit();