Skip to content

Commit c21a033

Browse files
GiganzoGiganzo
committed
Add hover styles to buttons in Script/Shader editor
1 parent 0c51ede commit c21a033

File tree

9 files changed

+49
-22
lines changed

9 files changed

+49
-22
lines changed

‎editor/doc/editor_help.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3459,9 +3459,9 @@ EditorHelp::EditorHelp() {
34593459
status_bar->set_custom_minimum_size(Size2(0, 24 * EDSCALE));
34603460

34613461
toggle_files_button = memnew(Button);
3462+
toggle_files_button->set_theme_type_variation(SceneStringName(FlatButton));
34623463
toggle_files_button->set_accessibility_name(TTRC("Scripts"));
34633464
toggle_files_button->set_tooltip_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
3464-
toggle_files_button->set_flat(true);
34653465
toggle_files_button->connect(SceneStringName(pressed), callable_mp(this, &EditorHelp::_toggle_files_pressed));
34663466
status_bar->add_child(toggle_files_button);
34673467

@@ -4891,23 +4891,23 @@ FindBar::FindBar() {
48914891
matches_label->hide();
48924892

48934893
find_prev = memnew(Button);
4894-
find_prev->set_flat(true);
4894+
find_prev->set_theme_type_variation(SceneStringName(FlatButton));
48954895
find_prev->set_disabled(results_count < 1);
48964896
find_prev->set_tooltip_text(TTR("Previous Match"));
48974897
add_child(find_prev);
48984898
find_prev->set_focus_mode(FOCUS_ACCESSIBILITY);
48994899
find_prev->connect(SceneStringName(pressed), callable_mp(this, &FindBar::search_prev));
49004900

49014901
find_next = memnew(Button);
4902-
find_next->set_flat(true);
4902+
find_next->set_theme_type_variation(SceneStringName(FlatButton));
49034903
find_next->set_disabled(results_count < 1);
49044904
find_next->set_tooltip_text(TTR("Next Match"));
49054905
add_child(find_next);
49064906
find_next->set_focus_mode(FOCUS_ACCESSIBILITY);
49074907
find_next->connect(SceneStringName(pressed), callable_mp(this, &FindBar::search_next));
49084908

49094909
hide_button = memnew(Button);
4910-
hide_button->set_flat(true);
4910+
hide_button->set_theme_type_variation(SceneStringName(FlatButton));
49114911
hide_button->set_tooltip_text(TTR("Hide"));
49124912
hide_button->set_focus_mode(FOCUS_ACCESSIBILITY);
49134913
hide_button->connect(SceneStringName(pressed), callable_mp(this, &FindBar::_hide_bar));

‎editor/gui/code_editor.cpp‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -753,9 +753,9 @@ void FindReplaceBar::_bind_methods() {
753753

754754
FindReplaceBar::FindReplaceBar() {
755755
toggle_replace_button = memnew(Button);
756+
toggle_replace_button->set_theme_type_variation(SceneStringName(FlatButton));
756757
add_child(toggle_replace_button);
757758
toggle_replace_button->set_accessibility_name(TTRC("Replace Mode"));
758-
toggle_replace_button->set_flat(true);
759759
toggle_replace_button->set_focus_mode(FOCUS_ACCESSIBILITY);
760760
toggle_replace_button->connect(SceneStringName(pressed), callable_mp(this, &FindReplaceBar::_toggle_replace_pressed));
761761

@@ -799,15 +799,15 @@ FindReplaceBar::FindReplaceBar() {
799799
matches_label->hide();
800800

801801
find_prev = memnew(Button);
802-
find_prev->set_flat(true);
802+
find_prev->set_theme_type_variation(SceneStringName(FlatButton));
803803
find_prev->set_disabled(results_count < 1);
804804
find_prev->set_tooltip_text(TTRC("Previous Match"));
805805
hbc_button_search->add_child(find_prev);
806806
find_prev->set_focus_mode(FOCUS_ACCESSIBILITY);
807807
find_prev->connect(SceneStringName(pressed), callable_mp(this, &FindReplaceBar::search_prev));
808808

809809
find_next = memnew(Button);
810-
find_next->set_flat(true);
810+
find_next->set_theme_type_variation(SceneStringName(FlatButton));
811811
find_next->set_disabled(results_count < 1);
812812
find_next->set_tooltip_text(TTRC("Next Match"));
813813
hbc_button_search->add_child(find_next);
@@ -852,7 +852,7 @@ FindReplaceBar::FindReplaceBar() {
852852
selection_only->connect(SceneStringName(toggled), callable_mp(this, &FindReplaceBar::_search_options_changed));
853853

854854
hide_button = memnew(Button);
855-
hide_button->set_flat(true);
855+
hide_button->set_theme_type_variation(SceneStringName(FlatButton));
856856
hide_button->set_tooltip_text(TTRC("Hide"));
857857
hide_button->set_focus_mode(FOCUS_ACCESSIBILITY);
858858
hide_button->connect(SceneStringName(pressed), callable_mp(this, &FindReplaceBar::_hide_bar));
@@ -1918,7 +1918,7 @@ CodeTextEditor::CodeTextEditor() {
19181918
error_column = 0;
19191919

19201920
toggle_files_button = memnew(Button);
1921-
toggle_files_button->set_flat(true);
1921+
toggle_files_button->set_theme_type_variation(SceneStringName(FlatButton));
19221922
toggle_files_button->set_v_size_flags(SIZE_EXPAND | SIZE_SHRINK_CENTER);
19231923
toggle_files_button->set_tooltip_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
19241924
toggle_files_button->connect(SceneStringName(pressed), callable_mp(this, &CodeTextEditor::_toggle_files_pressed));
@@ -1961,7 +1961,8 @@ CodeTextEditor::CodeTextEditor() {
19611961
// Zoom
19621962
zoom_button = memnew(MenuButton);
19631963
status_bar->add_child(zoom_button);
1964-
zoom_button->set_flat(true);
1964+
zoom_button->set_flat(false);
1965+
zoom_button->set_theme_type_variation("FlatMenuButton");
19651966
zoom_button->set_v_size_flags(SIZE_EXPAND | SIZE_SHRINK_CENTER);
19661967
zoom_button->set_text("100 %");
19671968
zoom_button->set_accessibility_name(TTRC("Zoom Factor"));

‎editor/gui/window_wrapper.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ void ScreenSelect::pressed() {
488488

489489
ScreenSelect::ScreenSelect() {
490490
set_button_mask(MouseButtonMask::RIGHT);
491-
set_flat(true);
491+
set_theme_type_variation(SceneStringName(FlatButton));
492492
set_toggle_mode(true);
493493
set_focus_mode(FOCUS_NONE);
494494
set_action_mode(ACTION_MODE_BUTTON_PRESS);

‎editor/script/script_editor_plugin.cpp‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4283,7 +4283,7 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
42834283
buttons_hbox->add_child(filename);
42844284

42854285
members_overview_alphabeta_sort_button = memnew(Button);
4286-
members_overview_alphabeta_sort_button->set_flat(true);
4286+
members_overview_alphabeta_sort_button->set_theme_type_variation(SceneStringName(FlatButton));
42874287
members_overview_alphabeta_sort_button->set_tooltip_text(TTRC("Toggle alphabetical sorting of the method list."));
42884288
members_overview_alphabeta_sort_button->set_toggle_mode(true);
42894289
members_overview_alphabeta_sort_button->set_pressed(EDITOR_GET("text_editor/script_list/sort_members_outline_alphabetically"));
@@ -4340,6 +4340,8 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
43404340
set_process_shortcut_input(true);
43414341

43424342
file_menu = memnew(MenuButton);
4343+
file_menu->set_flat(false);
4344+
file_menu->set_theme_type_variation("FlatMenuButton");
43434345
file_menu->set_text(TTRC("File"));
43444346
file_menu->set_switch_on_hover(true);
43454347
file_menu->set_shortcut_context(this);
@@ -4408,13 +4410,17 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
44084410
file_menu->get_popup()->connect("popup_hide", callable_mp(this, &ScriptEditor::_file_menu_closed));
44094411

44104412
script_search_menu = memnew(MenuButton);
4413+
script_search_menu->set_flat(false);
4414+
script_search_menu->set_theme_type_variation("FlatMenuButton");
44114415
script_search_menu->set_text(TTRC("Search"));
44124416
script_search_menu->set_switch_on_hover(true);
44134417
script_search_menu->set_shortcut_context(this);
44144418
script_search_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &ScriptEditor::_menu_option));
44154419
menu_hb->add_child(script_search_menu);
44164420

44174421
MenuButton *debug_menu_btn = memnew(MenuButton);
4422+
debug_menu_btn->set_flat(false);
4423+
debug_menu_btn->set_theme_type_variation("FlatMenuButton");
44184424
menu_hb->add_child(debug_menu_btn);
44194425
debug_menu_btn->hide(); // Handled by EditorDebuggerNode below.
44204426

@@ -4441,13 +4447,13 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
44414447
menu_hb->add_spacer();
44424448

44434449
site_search = memnew(Button);
4450+
site_search->set_theme_type_variation(SceneStringName(FlatButton));
44444451
site_search->set_accessibility_name(TTRC("Site Search"));
4445-
site_search->set_flat(true);
44464452
site_search->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditor::_menu_option).bind(SEARCH_WEBSITE));
44474453
menu_hb->add_child(site_search);
44484454

44494455
help_search = memnew(Button);
4450-
help_search->set_flat(true);
4456+
help_search->set_theme_type_variation(SceneStringName(FlatButton));
44514457
help_search->set_text(TTRC("Search Help"));
44524458
help_search->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditor::_menu_option).bind(SEARCH_HELP));
44534459
menu_hb->add_child(help_search);
@@ -4456,14 +4462,14 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
44564462
menu_hb->add_child(memnew(VSeparator));
44574463

44584464
script_back = memnew(Button);
4459-
script_back->set_flat(true);
4465+
script_back->set_theme_type_variation(SceneStringName(FlatButton));
44604466
script_back->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditor::_history_back));
44614467
menu_hb->add_child(script_back);
44624468
script_back->set_disabled(true);
44634469
script_back->set_tooltip_text(TTRC("Go to previous edited document."));
44644470

44654471
script_forward = memnew(Button);
4466-
script_forward->set_flat(true);
4472+
script_forward->set_theme_type_variation(SceneStringName(FlatButton));
44674473
script_forward->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditor::_history_forward));
44684474
menu_hb->add_child(script_forward);
44694475
script_forward->set_disabled(true);
@@ -4472,7 +4478,6 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
44724478
menu_hb->add_child(memnew(VSeparator));
44734479

44744480
make_floating = memnew(ScreenSelect);
4475-
make_floating->set_flat(true);
44764481
make_floating->set_tooltip_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
44774482
make_floating->connect("request_open_in_screen", callable_mp(window_wrapper, &WindowWrapper::enable_window_on_screen).bind(true));
44784483

‎editor/script/script_text_editor.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2857,6 +2857,8 @@ ScriptTextEditor::ScriptTextEditor() {
28572857
edit_hb = memnew(HBoxContainer);
28582858

28592859
edit_menu = memnew(MenuButton);
2860+
edit_menu->set_flat(false);
2861+
edit_menu->set_theme_type_variation("FlatMenuButton");
28602862
edit_menu->set_text(TTRC("Edit"));
28612863
edit_menu->set_switch_on_hover(true);
28622864
edit_menu->set_shortcut_context(this);
@@ -2873,11 +2875,15 @@ ScriptTextEditor::ScriptTextEditor() {
28732875
set_syntax_highlighter(highlighter);
28742876

28752877
search_menu = memnew(MenuButton);
2878+
search_menu->set_flat(false);
2879+
search_menu->set_theme_type_variation("FlatMenuButton");
28762880
search_menu->set_text(TTRC("Search"));
28772881
search_menu->set_switch_on_hover(true);
28782882
search_menu->set_shortcut_context(this);
28792883

28802884
goto_menu = memnew(MenuButton);
2885+
goto_menu->set_flat(false);
2886+
goto_menu->set_theme_type_variation("FlatMenuButton");
28812887
goto_menu->set_text(TTRC("Go To"));
28822888
goto_menu->set_switch_on_hover(true);
28832889
goto_menu->set_shortcut_context(this);

‎editor/script/text_editor.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -626,6 +626,8 @@ TextEditor::TextEditor() {
626626
edit_hb = memnew(HBoxContainer);
627627

628628
edit_menu = memnew(MenuButton);
629+
edit_menu->set_flat(false);
630+
edit_menu->set_theme_type_variation("FlatMenuButton");
629631
edit_menu->set_shortcut_context(this);
630632
edit_hb->add_child(edit_menu);
631633
edit_menu->set_text(TTRC("Edit"));
@@ -681,6 +683,8 @@ TextEditor::TextEditor() {
681683
set_syntax_highlighter(plain_highlighter);
682684

683685
search_menu = memnew(MenuButton);
686+
search_menu->set_flat(false);
687+
search_menu->set_theme_type_variation("FlatMenuButton");
684688
search_menu->set_shortcut_context(this);
685689
edit_hb->add_child(search_menu);
686690
search_menu->set_text(TTRC("Search"));
@@ -696,6 +700,8 @@ TextEditor::TextEditor() {
696700
search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/replace_in_files"), REPLACE_IN_FILES);
697701

698702
MenuButton *goto_menu = memnew(MenuButton);
703+
goto_menu->set_flat(false);
704+
goto_menu->set_theme_type_variation("FlatMenuButton");
699705
goto_menu->set_shortcut_context(this);
700706
edit_hb->add_child(goto_menu);
701707
goto_menu->set_text(TTRC("Go To"));

‎editor/shader/shader_editor_plugin.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,8 @@ ShaderEditorPlugin::ShaderEditorPlugin() {
905905
menu_hb = memnew(HBoxContainer);
906906
main_container->add_child(menu_hb);
907907
file_menu = memnew(MenuButton);
908+
file_menu->set_flat(false);
909+
file_menu->set_theme_type_variation("FlatMenuButton");
908910
file_menu->set_text(TTR("File"));
909911
file_menu->set_switch_on_hover(true);
910912
file_menu->set_shortcut_context(files_split);
@@ -921,7 +923,6 @@ ShaderEditorPlugin::ShaderEditorPlugin() {
921923
menu_spacer = menu_hb->add_spacer();
922924

923925
make_floating = memnew(ScreenSelect);
924-
make_floating->set_flat(true);
925926
make_floating->connect("request_open_in_screen", callable_mp(window_wrapper, &WindowWrapper::enable_window_on_screen).bind(true));
926927
if (!make_floating->is_disabled()) {
927928
// Override default ScreenSelect tooltip if multi-window support is available.

‎editor/shader/text_shader_editor.cpp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1207,6 +1207,8 @@ TextShaderEditor::TextShaderEditor() {
12071207
hbc = memnew(HBoxContainer);
12081208

12091209
edit_menu = memnew(MenuButton);
1210+
edit_menu->set_flat(false);
1211+
edit_menu->set_theme_type_variation("FlatMenuButton");
12101212
edit_menu->set_shortcut_context(this);
12111213
edit_menu->set_text(TTR("Edit"));
12121214
edit_menu->set_switch_on_hover(true);
@@ -1235,6 +1237,8 @@ TextShaderEditor::TextShaderEditor() {
12351237
edit_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &TextShaderEditor::_menu_option));
12361238

12371239
search_menu = memnew(MenuButton);
1240+
search_menu->set_flat(false);
1241+
search_menu->set_theme_type_variation("FlatMenuButton");
12381242
search_menu->set_shortcut_context(this);
12391243
search_menu->set_text(TTR("Search"));
12401244
search_menu->set_switch_on_hover(true);
@@ -1246,6 +1250,8 @@ TextShaderEditor::TextShaderEditor() {
12461250
search_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &TextShaderEditor::_menu_option));
12471251

12481252
MenuButton *goto_menu = memnew(MenuButton);
1253+
goto_menu->set_flat(false);
1254+
goto_menu->set_theme_type_variation("FlatMenuButton");
12491255
goto_menu->set_shortcut_context(this);
12501256
goto_menu->set_text(TTR("Go To"));
12511257
goto_menu->set_switch_on_hover(true);
@@ -1267,7 +1273,7 @@ TextShaderEditor::TextShaderEditor() {
12671273
hbc->add_spacer();
12681274

12691275
site_search = memnew(Button);
1270-
site_search->set_flat(true);
1276+
site_search->set_theme_type_variation(SceneStringName(FlatButton));
12711277
site_search->connect(SceneStringName(pressed), callable_mp(this, &TextShaderEditor::_menu_option).bind(HELP_DOCS));
12721278
site_search->set_text(TTR("Online Docs"));
12731279
site_search->set_tooltip_text(TTR("Open Godot online documentation."));

‎editor/shader/visual_shader_editor_plugin.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6672,7 +6672,7 @@ VisualShaderEditor::VisualShaderEditor() {
66726672
toolbar->move_child(edit_type_fog, 0);
66736673

66746674
add_node = memnew(Button);
6675-
add_node->set_flat(true);
6675+
add_node->set_theme_type_variation(SceneStringName(FlatButton));
66766676
add_node->set_text(TTR("Add Node..."));
66776677
toolbar->add_child(add_node);
66786678
toolbar->move_child(add_node, 0);
@@ -6682,6 +6682,8 @@ VisualShaderEditor::VisualShaderEditor() {
66826682
graph->connect("frame_rect_changed", callable_mp(this, &VisualShaderEditor::_frame_rect_changed));
66836683

66846684
varying_button = memnew(MenuButton);
6685+
varying_button->set_flat(false);
6686+
varying_button->set_theme_type_variation("FlatMenuButton");
66856687
varying_button->set_text(TTR("Manage Varyings"));
66866688
varying_button->set_switch_on_hover(true);
66876689
toolbar->add_child(varying_button);
@@ -6711,7 +6713,7 @@ VisualShaderEditor::VisualShaderEditor() {
67116713
toolbar->add_child(spacer);
67126714

67136715
site_search = memnew(Button);
6714-
site_search->set_flat(true);
6716+
site_search->set_theme_type_variation(SceneStringName(FlatButton));
67156717
site_search->connect(SceneStringName(pressed), callable_mp(this, &VisualShaderEditor::_help_open));
67166718
site_search->set_text(TTR("Online Docs"));
67176719
site_search->set_tooltip_text(TTR("Open Godot online documentation."));
@@ -6727,7 +6729,7 @@ VisualShaderEditor::VisualShaderEditor() {
67276729
toolbar->move_child(separator, 0);
67286730

67296731
toggle_files_button = memnew(Button);
6730-
toggle_files_button->set_flat(true);
6732+
toggle_files_button->set_theme_type_variation(SceneStringName(FlatButton));
67316733
toggle_files_button->connect(SceneStringName(pressed), callable_mp(this, &VisualShaderEditor::_toggle_files_pressed));
67326734
toolbar->add_child(toggle_files_button);
67336735
toolbar->move_child(toggle_files_button, 0);

0 commit comments

Comments
 (0)