diff options
Diffstat (limited to 'scene/gui/slider.h')
| -rw-r--r-- | scene/gui/slider.h | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/scene/gui/slider.h b/scene/gui/slider.h index 1248044ec4..46fa08bbf0 100644 --- a/scene/gui/slider.h +++ b/scene/gui/slider.h @@ -5,8 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ +/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -34,30 +34,29 @@ #include "scene/gui/range.h" class Slider : public Range { - GDCLASS(Slider, Range); struct Grab { - int pos; - float uvalue; - bool active; + int pos = 0; + float uvalue = 0.0; + bool active = false; } grab; - int ticks; - bool mouse_inside; + int ticks = 0; + bool mouse_inside = false; Orientation orientation; - float custom_step; - bool editable; - bool scrollable; + float custom_step = -1.0; + bool editable = true; + bool scrollable = true; protected: - void _gui_input(Ref<InputEvent> p_event); + virtual void gui_input(const Ref<InputEvent> &p_event) override; void _notification(int p_what); static void _bind_methods(); - bool ticks_on_borders; + bool ticks_on_borders = false; public: - virtual Size2 get_minimum_size() const; + virtual Size2 get_minimum_size() const override; void set_custom_step(float p_custom_step); float get_custom_step() const; @@ -78,7 +77,6 @@ public: }; class HSlider : public Slider { - GDCLASS(HSlider, Slider); public: @@ -87,7 +85,6 @@ public: }; class VSlider : public Slider { - GDCLASS(VSlider, Slider); public: |