godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #40289 from YeldhamDev/guitab_icon_use_hl 

Prefer the highlight version of the "GuiTabIcon" icon for buttons, and make their width/height equal
This commit is contained in:
Rémi Verschelde 2020-07-13 16:36:28 +02:00 committed by GitHub
parent 59c75d8f16 26381265b8
commit 07db4d57d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/editor_audio_buses.cpp
View File

@ -84,7 +84,7 @@ void EditorAudioBus::_notification(int p_what) {
bypass->set_icon(get_theme_icon("AudioBusBypass", "EditorIcons"));
bypass->add_theme_color_override("icon_color_pressed", bypass_color);
bus_options->set_icon(get_theme_icon("GuiTabMenu", "EditorIcons"));
bus_options->set_icon(get_theme_icon("GuiTabMenuHl", "EditorIcons"));
update_bus();
set_process(true);
@ -172,7 +172,7 @@ void EditorAudioBus::_notification(int p_what) {
mute->set_icon(get_theme_icon("AudioBusMute", "EditorIcons"));
bypass->set_icon(get_theme_icon("AudioBusBypass", "EditorIcons"));
bus_options->set_icon(get_theme_icon("GuiTabMenu", "EditorIcons"));
bus_options->set_icon(get_theme_icon("GuiTabMenuHl", "EditorIcons"));
} break;
case NOTIFICATION_MOUSE_EXIT:
case NOTIFICATION_DRAG_END: {

2
editor/icons/GuiTabMenu.svg
View File

@ -1 +1 @@
<svg height="16" viewBox="0 0 6 16" width="6" xmlns="http://www.w3.org/2000/svg"><path d="m3 0a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -2-2zm0 6a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -2-2zm0 6a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -2-2z" fill="#fff" fill-opacity=".39216"/></svg>
<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m8 0a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -2-2zm0 6a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -2-2zm0 6a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -2-2z" fill="#fff" fill-opacity=".39216"/></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 322 B

After

Width:  |  Height:  |  Size: 324 B

2
editor/icons/GuiTabMenuHl.svg
View File

@ -1 +1 @@
<svg height="16" viewBox="0 0 6 16" width="6" xmlns="http://www.w3.org/2000/svg"><path d="m3 0a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -2-2zm0 6a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -2-2zm0 6a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -2-2z" fill="#e0e0e0"/></svg>
<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m8 0a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -2-2zm0 6a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -2-2zm0 6a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -2-2z" fill="#e0e0e0"/></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 303 B

After

Width:  |  Height:  |  Size: 305 B

2
editor/plugins/animation_player_editor_plugin.cpp
View File

@ -117,7 +117,7 @@ void AnimationPlayerEditor::_notification(int p_what) {
stop->set_icon(get_theme_icon("Stop", "EditorIcons"));
onion_toggle->set_icon(get_theme_icon("Onion", "EditorIcons"));
onion_skinning->set_icon(get_theme_icon("GuiTabMenu", "EditorIcons"));
onion_skinning->set_icon(get_theme_icon("GuiTabMenuHl", "EditorIcons"));
pin->set_icon(get_theme_icon("Pin", "EditorIcons"));

4
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -3982,7 +3982,7 @@ void CanvasItemEditor::_notification(int p_what) {
rotate_button->set_icon(get_theme_icon("ToolRotate", "EditorIcons"));
smart_snap_button->set_icon(get_theme_icon("Snap", "EditorIcons"));
grid_snap_button->set_icon(get_theme_icon("SnapGrid", "EditorIcons"));
snap_config_menu->set_icon(get_theme_icon("GuiTabMenu", "EditorIcons"));
snap_config_menu->set_icon(get_theme_icon("GuiTabMenuHl", "EditorIcons"));
skeleton_menu->set_icon(get_theme_icon("Bone", "EditorIcons"));
override_camera_button->set_icon(get_theme_icon("Camera2D", "EditorIcons"));
pan_button->set_icon(get_theme_icon("ToolPan", "EditorIcons"));
@ -3999,7 +3999,7 @@ void CanvasItemEditor::_notification(int p_what) {
key_scale_button->set_icon(get_theme_icon("KeyScale", "EditorIcons"));
key_insert_button->set_icon(get_theme_icon("Key", "EditorIcons"));
key_auto_insert_button->set_icon(get_theme_icon("AutoKey", "EditorIcons"));
animation_menu->set_icon(get_theme_icon("GuiTabMenu", "EditorIcons"));
animation_menu->set_icon(get_theme_icon("GuiTabMenuHl", "EditorIcons"));
zoom_minus->set_icon(get_theme_icon("ZoomLess", "EditorIcons"));
zoom_plus->set_icon(get_theme_icon("ZoomMore", "EditorIcons"));

2
editor/plugins/node_3d_editor_plugin.cpp
View File

@ -2551,7 +2551,7 @@ void Node3DEditorViewport::_notification(int p_what) {
}
if (p_what == NOTIFICATION_THEME_CHANGED) {
view_menu->set_icon(get_theme_icon("GuiTabMenu", "EditorIcons"));
view_menu->set_icon(get_theme_icon("GuiTabMenuHl", "EditorIcons"));
preview_camera->set_icon(get_theme_icon("Camera3D", "EditorIcons"));
view_menu->add_theme_style_override("normal", editor->get_gui_base()->get_theme_stylebox("Information3dViewport", "EditorStyles"));