godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-02 16:48:55 +00:00
Code Releases Wiki Activity

Remove unnecessary theme settings when constructing FindInFilesContainer

Browse Source
This commit is contained in:
jinyangcruise
2025-11-13 10:24:10 +08:00
parent e6aa06d3de
commit 26596a8d24
2 changed files with 13 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
editor/script/find_in_files.cpp
View File

@@ -35,6 +35,7 @@
#include "core/os/os.h" #include "core/os/os.h"
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "editor/editor_string_names.h" #include "editor/editor_string_names.h"
#include "editor/gui/editor_bottom_panel.h"
#include "editor/themes/editor_scale.h" #include "editor/themes/editor_scale.h"
#include "scene/gui/box_container.h" #include "scene/gui/box_container.h"
#include "scene/gui/button.h" #include "scene/gui/button.h"
@@ -1267,14 +1268,6 @@ void FindInFilesPanel::_bind_methods() {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
FindInFilesContainer::FindInFilesContainer() { FindInFilesContainer::FindInFilesContainer() {
const Ref<StyleBox> bottom_panel_style = EditorNode::get_singleton()->get_editor_theme()->get_stylebox(SNAME("BottomPanel"), EditorStringName(EditorStyles));
if (bottom_panel_style.is_valid()) {
add_theme_constant_override("margin_top", -bottom_panel_style->get_margin(SIDE_TOP));
add_theme_constant_override("margin_left", -bottom_panel_style->get_margin(SIDE_LEFT));
add_theme_constant_override("margin_right", -bottom_panel_style->get_margin(SIDE_RIGHT));
add_theme_constant_override("margin_bottom", -bottom_panel_style->get_margin(SIDE_BOTTOM));
}
_tabs = memnew(TabContainer); _tabs = memnew(TabContainer);
_tabs->set_tabs_visible(false); _tabs->set_tabs_visible(false);
add_child(_tabs); add_child(_tabs);
@@ -1292,6 +1285,8 @@ FindInFilesContainer::FindInFilesContainer() {
_tabs_context_menu->add_item(TTRC("Close Tabs to the Right"), PANEL_CLOSE_RIGHT); _tabs_context_menu->add_item(TTRC("Close Tabs to the Right"), PANEL_CLOSE_RIGHT);
_tabs_context_menu->add_item(TTRC("Close All Tabs"), PANEL_CLOSE_ALL); _tabs_context_menu->add_item(TTRC("Close All Tabs"), PANEL_CLOSE_ALL);
_tabs_context_menu->connect(SceneStringName(id_pressed), callable_mp(this, &FindInFilesContainer::_bar_menu_option)); _tabs_context_menu->connect(SceneStringName(id_pressed), callable_mp(this, &FindInFilesContainer::_bar_menu_option));
EditorNode::get_bottom_panel()->connect(SceneStringName(theme_changed), callable_mp(this, &FindInFilesContainer::_on_theme_changed));
} }
FindInFilesPanel *FindInFilesContainer::_create_new_panel() { FindInFilesPanel *FindInFilesContainer::_create_new_panel() {
@@ -1348,30 +1343,15 @@ void FindInFilesContainer::_bind_methods() {
ADD_SIGNAL(MethodInfo("close_button_clicked")); ADD_SIGNAL(MethodInfo("close_button_clicked"));
} }
void FindInFilesContainer::_notification(int p_what) { void FindInFilesContainer::_on_theme_changed() {
switch (p_what) { const Ref<StyleBox> bottom_panel_style = EditorNode::get_singleton()->get_editor_theme()->get_stylebox(SNAME("BottomPanel"), EditorStringName(EditorStyles));
case NOTIFICATION_THEME_CHANGED: { if (bottom_panel_style.is_valid()) {
const Ref<StyleBox> bottom_panel_style = EditorNode::get_singleton()->get_editor_theme()->get_stylebox(SNAME("BottomPanel"), EditorStringName(EditorStyles)); begin_bulk_theme_override();
if (bottom_panel_style.is_valid()) { add_theme_constant_override("margin_top", -bottom_panel_style->get_margin(SIDE_TOP));
const int margin_top = -bottom_panel_style->get_margin(SIDE_TOP); add_theme_constant_override("margin_left", -bottom_panel_style->get_margin(SIDE_LEFT));
const int margin_left = -bottom_panel_style->get_margin(SIDE_LEFT); add_theme_constant_override("margin_right", -bottom_panel_style->get_margin(SIDE_RIGHT));
const int margin_right = -bottom_panel_style->get_margin(SIDE_RIGHT); add_theme_constant_override("margin_bottom", -bottom_panel_style->get_margin(SIDE_BOTTOM));
const int margin_bottom = -bottom_panel_style->get_margin(SIDE_BOTTOM); end_bulk_theme_override();
if (get_theme_constant("margin_top") != margin_top) {
add_theme_constant_override("margin_top", margin_top);
}
if (get_theme_constant("margin_left") != margin_left) {
add_theme_constant_override("margin_left", margin_left);
}
if (get_theme_constant("margin_right") != margin_right) {
add_theme_constant_override("margin_right", margin_right);
}
if (get_theme_constant("margin_bottom") != margin_bottom) {
add_theme_constant_override("margin_bottom", margin_bottom);
}
}
} break;
} }
} }

2
editor/script/find_in_files.h
View File

@@ -262,6 +262,7 @@ class FindInFilesContainer : public MarginContainer {
PANEL_CLOSE_ALL, PANEL_CLOSE_ALL,
}; };
void _on_theme_changed();
void _on_tab_close_pressed(int p_tab); void _on_tab_close_pressed(int p_tab);
void _update_bar_visibility(); void _update_bar_visibility();
void _bar_menu_option(int p_option); void _bar_menu_option(int p_option);
@@ -276,7 +277,6 @@ class FindInFilesContainer : public MarginContainer {
protected: protected:
static void _bind_methods(); static void _bind_methods();
void _notification(int p_what);
void _on_find_in_files_result_selected(const String &p_fpath, int p_line_number, int p_begin, int p_end); void _on_find_in_files_result_selected(const String &p_fpath, int p_line_number, int p_begin, int p_end);
void _on_find_in_files_modified_files(const PackedStringArray &p_paths); void _on_find_in_files_modified_files(const PackedStringArray &p_paths);