Skip to content

Commit 0ee60dd

Browse files
RepiteoRepiteo
committed
Merge pull request #99516 from KoBeWi/quantum_entanglement_of_source_files
Untangle ColorPicker includes
2 parents 127738c + 289e548 commit 0ee60dd

10 files changed

+42
-34
lines changed

‎editor/editor_properties.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
#include "scene/3d/fog_volume.h"
5353
#include "scene/3d/gpu_particles_3d.h"
5454
#include "scene/gui/color_picker.h"
55+
#include "scene/gui/grid_container.h"
5556
#include "scene/main/window.h"
5657
#include "scene/resources/font.h"
5758
#include "scene/resources/mesh.h"

‎editor/plugins/node_3d_editor_plugin.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
#include "scene/gui/center_container.h"
9393
#include "scene/gui/color_picker.h"
9494
#include "scene/gui/flow_container.h"
95+
#include "scene/gui/separator.h"
9596
#include "scene/gui/split_container.h"
9697
#include "scene/gui/subviewport_container.h"
9798
#include "scene/resources/3d/sky_material.h"

‎editor/plugins/script_editor_plugin.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@
6464
#include "editor/themes/editor_scale.h"
6565
#include "editor/themes/editor_theme_manager.h"
6666
#include "editor/window_wrapper.h"
67+
#include "scene/gui/separator.h"
68+
#include "scene/gui/texture_rect.h"
6769
#include "scene/main/node.h"
6870
#include "scene/main/window.h"
6971
#include "script_text_editor.h"

‎editor/plugins/script_text_editor.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
#include "editor/editor_string_names.h"
4141
#include "editor/gui/editor_toaster.h"
4242
#include "editor/themes/editor_scale.h"
43+
#include "scene/gui/menu_button.h"
4344
#include "scene/gui/rich_text_label.h"
4445
#include "scene/gui/split_container.h"
4546

‎editor/plugins/theme_editor_plugin.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848
#include "scene/gui/option_button.h"
4949
#include "scene/gui/panel_container.h"
5050
#include "scene/gui/scroll_container.h"
51+
#include "scene/gui/separator.h"
52+
#include "scene/gui/spin_box.h"
5153
#include "scene/gui/split_container.h"
5254
#include "scene/gui/tab_bar.h"
5355
#include "scene/gui/tab_container.h"

‎editor/plugins/theme_editor_preview.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,15 @@
4141
#include "scene/gui/check_button.h"
4242
#include "scene/gui/color_picker.h"
4343
#include "scene/gui/color_rect.h"
44+
#include "scene/gui/label.h"
4445
#include "scene/gui/margin_container.h"
46+
#include "scene/gui/menu_button.h"
47+
#include "scene/gui/option_button.h"
48+
#include "scene/gui/panel.h"
4549
#include "scene/gui/progress_bar.h"
4650
#include "scene/gui/scroll_container.h"
51+
#include "scene/gui/separator.h"
52+
#include "scene/gui/spin_box.h"
4753
#include "scene/gui/tab_container.h"
4854
#include "scene/gui/text_edit.h"
4955
#include "scene/gui/tree.h"

‎editor/plugins/visual_shader_editor_plugin.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
#include "scene/gui/rich_text_label.h"
6060
#include "scene/gui/separator.h"
6161
#include "scene/gui/split_container.h"
62+
#include "scene/gui/texture_rect.h"
6263
#include "scene/gui/tree.h"
6364
#include "scene/gui/view_panner.h"
6465
#include "scene/main/window.h"

‎scene/gui/color_mode.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333

3434
#include "scene/gui/color_picker.h"
3535

36-
struct Color;
37-
3836
class ColorMode {
3937
public:
4038
ColorPicker *color_picker = nullptr;

‎scene/gui/color_picker.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,25 @@
3030

3131
#include "color_picker.h"
3232

33-
#include "core/input/input.h"
3433
#include "core/io/image.h"
35-
#include "core/math/color.h"
34+
#include "scene/gui/aspect_ratio_container.h"
3635
#include "scene/gui/color_mode.h"
36+
#include "scene/gui/grid_container.h"
37+
#include "scene/gui/label.h"
38+
#include "scene/gui/line_edit.h"
3739
#include "scene/gui/margin_container.h"
40+
#include "scene/gui/menu_button.h"
41+
#include "scene/gui/option_button.h"
42+
#include "scene/gui/popup_menu.h"
43+
#include "scene/gui/slider.h"
44+
#include "scene/gui/spin_box.h"
45+
#include "scene/gui/texture_rect.h"
3846
#include "scene/resources/image_texture.h"
3947
#include "scene/resources/style_box_flat.h"
4048
#include "scene/resources/style_box_texture.h"
4149
#include "scene/theme/theme_db.h"
42-
#include "servers/display_server.h"
4350
#include "thirdparty/misc/ok_color_shader.h"
4451

45-
List<Color> ColorPicker::preset_cache;
46-
List<Color> ColorPicker::recent_preset_cache;
47-
4852
void ColorPicker::_notification(int p_what) {
4953
switch (p_what) {
5054
case NOTIFICATION_ENTER_TREE: {
@@ -159,10 +163,6 @@ void ColorPicker::_update_theme_item_cache() {
159163
theme_cache.base_scale = get_theme_default_base_scale();
160164
}
161165

162-
Ref<Shader> ColorPicker::wheel_shader;
163-
Ref<Shader> ColorPicker::circle_shader;
164-
Ref<Shader> ColorPicker::circle_ok_color_shader;
165-
166166
void ColorPicker::init_shaders() {
167167
wheel_shader.instantiate();
168168
wheel_shader->set_code(R"(

‎scene/gui/color_picker.h‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,28 +31,24 @@
3131
#ifndef COLOR_PICKER_H
3232
#define COLOR_PICKER_H
3333

34-
#include "scene/gui/aspect_ratio_container.h"
3534
#include "scene/gui/box_container.h"
3635
#include "scene/gui/button.h"
37-
#include "scene/gui/control.h"
38-
#include "scene/gui/grid_container.h"
39-
#include "scene/gui/label.h"
40-
#include "scene/gui/line_edit.h"
41-
#include "scene/gui/menu_button.h"
42-
#include "scene/gui/option_button.h"
43-
#include "scene/gui/panel.h"
4436
#include "scene/gui/popup.h"
45-
#include "scene/gui/separator.h"
46-
#include "scene/gui/slider.h"
47-
#include "scene/gui/spin_box.h"
48-
#include "scene/gui/texture_rect.h"
49-
#include "scene/resources/style_box_flat.h"
5037

38+
class AspectRatioContainer;
5139
class ColorMode;
52-
class ColorModeRGB;
53-
class ColorModeHSV;
54-
class ColorModeRAW;
55-
class ColorModeOKHSL;
40+
class ColorPickerShape;
41+
class GridContainer;
42+
class HSlider;
43+
class Label;
44+
class LineEdit;
45+
class MarginContainer;
46+
class MenuButton;
47+
class OptionButton;
48+
class PopupMenu;
49+
class SpinBox;
50+
class StyleBoxFlat;
51+
class TextureRect;
5652

5753
class ColorPresetButton : public BaseButton {
5854
GDCLASS(ColorPresetButton, BaseButton);
@@ -110,11 +106,11 @@ class ColorPicker : public VBoxContainer {
110106
static const int SLIDER_COUNT = 4;
111107

112108
private:
113-
static Ref<Shader> wheel_shader;
114-
static Ref<Shader> circle_shader;
115-
static Ref<Shader> circle_ok_color_shader;
116-
static List<Color> preset_cache;
117-
static List<Color> recent_preset_cache;
109+
static inline Ref<Shader> wheel_shader;
110+
static inline Ref<Shader> circle_shader;
111+
static inline Ref<Shader> circle_ok_color_shader;
112+
static inline List<Color> preset_cache;
113+
static inline List<Color> recent_preset_cache;
118114

119115
#ifdef TOOLS_ENABLED
120116
Object *editor_settings = nullptr;

0 commit comments

Comments
 (0)