mirror of
https://github.com/godotengine/godot.git
synced 2026-01-03 18:11:19 +03:00
Merge pull request #98039 from aaronfranke/button-icon
Rename internal Button `*_icon` functions to `*_button_icon` to match exposed methods
This commit is contained in:
@@ -495,7 +495,7 @@ void FileSystemDock::_update_display_mode(bool p_force) {
|
||||
if (p_force || old_display_mode != display_mode) {
|
||||
switch (display_mode) {
|
||||
case DISPLAY_MODE_TREE_ONLY:
|
||||
button_toggle_display_mode->set_icon(get_editor_theme_icon(SNAME("Panels1")));
|
||||
button_toggle_display_mode->set_button_icon(get_editor_theme_icon(SNAME("Panels1")));
|
||||
tree->show();
|
||||
tree->set_v_size_flags(SIZE_EXPAND_FILL);
|
||||
toolbar2_hbc->show();
|
||||
@@ -512,7 +512,7 @@ void FileSystemDock::_update_display_mode(bool p_force) {
|
||||
const int actual_offset = is_vertical ? split_box_offset_v : split_box_offset_h;
|
||||
split_box->set_split_offset(actual_offset);
|
||||
const StringName icon = is_vertical ? SNAME("Panels2") : SNAME("Panels2Alt");
|
||||
button_toggle_display_mode->set_icon(get_editor_theme_icon(icon));
|
||||
button_toggle_display_mode->set_button_icon(get_editor_theme_icon(icon));
|
||||
|
||||
tree->show();
|
||||
tree->set_v_size_flags(SIZE_EXPAND_FILL);
|
||||
@@ -597,7 +597,7 @@ void FileSystemDock::_notification(int p_what) {
|
||||
case NOTIFICATION_THEME_CHANGED: {
|
||||
_update_display_mode(true);
|
||||
|
||||
button_reload->set_icon(get_editor_theme_icon(SNAME("Reload")));
|
||||
button_reload->set_button_icon(get_editor_theme_icon(SNAME("Reload")));
|
||||
|
||||
StringName mode_icon = "Panels1";
|
||||
if (display_mode == DISPLAY_MODE_VSPLIT) {
|
||||
@@ -605,28 +605,28 @@ void FileSystemDock::_notification(int p_what) {
|
||||
} else if (display_mode == DISPLAY_MODE_HSPLIT) {
|
||||
mode_icon = "Panels2Alt";
|
||||
}
|
||||
button_toggle_display_mode->set_icon(get_editor_theme_icon(mode_icon));
|
||||
button_toggle_display_mode->set_button_icon(get_editor_theme_icon(mode_icon));
|
||||
|
||||
if (file_list_display_mode == FILE_LIST_DISPLAY_LIST) {
|
||||
button_file_list_display_mode->set_icon(get_editor_theme_icon(SNAME("FileThumbnail")));
|
||||
button_file_list_display_mode->set_button_icon(get_editor_theme_icon(SNAME("FileThumbnail")));
|
||||
} else {
|
||||
button_file_list_display_mode->set_icon(get_editor_theme_icon(SNAME("FileList")));
|
||||
button_file_list_display_mode->set_button_icon(get_editor_theme_icon(SNAME("FileList")));
|
||||
}
|
||||
|
||||
tree_search_box->set_right_icon(get_editor_theme_icon(SNAME("Search")));
|
||||
tree_button_sort->set_icon(get_editor_theme_icon(SNAME("Sort")));
|
||||
tree_button_sort->set_button_icon(get_editor_theme_icon(SNAME("Sort")));
|
||||
|
||||
file_list_search_box->set_right_icon(get_editor_theme_icon(SNAME("Search")));
|
||||
file_list_button_sort->set_icon(get_editor_theme_icon(SNAME("Sort")));
|
||||
file_list_button_sort->set_button_icon(get_editor_theme_icon(SNAME("Sort")));
|
||||
|
||||
button_dock_placement->set_icon(get_editor_theme_icon(SNAME("GuiTabMenuHl")));
|
||||
button_dock_placement->set_button_icon(get_editor_theme_icon(SNAME("GuiTabMenuHl")));
|
||||
|
||||
if (is_layout_rtl()) {
|
||||
button_hist_next->set_icon(get_editor_theme_icon(SNAME("Back")));
|
||||
button_hist_prev->set_icon(get_editor_theme_icon(SNAME("Forward")));
|
||||
button_hist_next->set_button_icon(get_editor_theme_icon(SNAME("Back")));
|
||||
button_hist_prev->set_button_icon(get_editor_theme_icon(SNAME("Forward")));
|
||||
} else {
|
||||
button_hist_next->set_icon(get_editor_theme_icon(SNAME("Forward")));
|
||||
button_hist_prev->set_icon(get_editor_theme_icon(SNAME("Back")));
|
||||
button_hist_next->set_button_icon(get_editor_theme_icon(SNAME("Forward")));
|
||||
button_hist_prev->set_button_icon(get_editor_theme_icon(SNAME("Back")));
|
||||
}
|
||||
|
||||
overwrite_dialog_scroll->add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SceneStringName(panel), "Tree"));
|
||||
@@ -818,11 +818,11 @@ void FileSystemDock::_toggle_file_display() {
|
||||
void FileSystemDock::_set_file_display(bool p_active) {
|
||||
if (p_active) {
|
||||
file_list_display_mode = FILE_LIST_DISPLAY_LIST;
|
||||
button_file_list_display_mode->set_icon(get_editor_theme_icon(SNAME("FileThumbnail")));
|
||||
button_file_list_display_mode->set_button_icon(get_editor_theme_icon(SNAME("FileThumbnail")));
|
||||
button_file_list_display_mode->set_tooltip_text(TTR("View items as a grid of thumbnails."));
|
||||
} else {
|
||||
file_list_display_mode = FILE_LIST_DISPLAY_THUMBNAILS;
|
||||
button_file_list_display_mode->set_icon(get_editor_theme_icon(SNAME("FileList")));
|
||||
button_file_list_display_mode->set_button_icon(get_editor_theme_icon(SNAME("FileList")));
|
||||
button_file_list_display_mode->set_tooltip_text(TTR("View items as a list."));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user