RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 19:27:45 +00:00
Code Issues Activity Actions

Base: Rename maximize/minimize icons to a more generic name

Browse source 
This reduces naming confusion when the icons are used for other
use cases that require a triangle shape
This commit is contained in:
Idan Horowitz 2020-12-28 00:38:03 +02:00 • committed by Andreas Kling
parent 26cb083c6e
commit 6efdabfc6f
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Applications/ThemeEditor/PreviewWidget.cpp
View file

@ -94,8 +94,8 @@ PreviewWidget::PreviewWidget(const Gfx::Palette& preview_palette)
m_inactive_window_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/window.png"); m_inactive_window_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/window.png");
m_close_bitmap = Gfx::Bitmap::load_from_file("/res/icons/16x16/window-close.png"); m_close_bitmap = Gfx::Bitmap::load_from_file("/res/icons/16x16/window-close.png");
m_maximize_bitmap = Gfx::Bitmap::load_from_file("/res/icons/16x16/window-maximize.png"); m_maximize_bitmap = Gfx::Bitmap::load_from_file("/res/icons/16x16/upward-triangle.png");
m_minimize_bitmap = Gfx::Bitmap::load_from_file("/res/icons/16x16/window-minimize.png"); m_minimize_bitmap = Gfx::Bitmap::load_from_file("/res/icons/16x16/downward-triangle.png");
m_gallery = add<MiniWidgetGallery>(); m_gallery = add<MiniWidgetGallery>();
set_greedy_for_hits(true); set_greedy_for_hits(true);

0
Base/res/icons/16x16/window-minimize.png → Base/res/icons/16x16/downward-triangle.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 92 B

After

Width:  |  Height:  |  Size: 92 B

Before After
Before After

0
Base/res/icons/16x16/window-maximize.png → Base/res/icons/16x16/upward-triangle.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 90 B

After

Width:  |  Height:  |  Size: 90 B

Before After
Before After

4
Services/WindowServer/Window.cpp
View file

@ -54,7 +54,7 @@ static Gfx::Bitmap& minimize_icon()
{ {
static Gfx::Bitmap* s_icon; static Gfx::Bitmap* s_icon;
if (!s_icon) if (!s_icon)
s_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/window-minimize.png").leak_ref(); s_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/downward-triangle.png").leak_ref();
return *s_icon; return *s_icon;
} }
@ -62,7 +62,7 @@ static Gfx::Bitmap& maximize_icon()
{ {
static Gfx::Bitmap* s_icon; static Gfx::Bitmap* s_icon;
if (!s_icon) if (!s_icon)
s_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/window-maximize.png").leak_ref(); s_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/upward-triangle.png").leak_ref();
return *s_icon; return *s_icon;
} }

4
Services/WindowServer/WindowFrame.cpp
View file

@ -102,14 +102,14 @@ void WindowFrame::set_button_icons()
full_path.append(icons_path); full_path.append(icons_path);
full_path.append("window-minimize.png"); full_path.append("window-minimize.png");
if (!(s_minimize_icon = Gfx::Bitmap::load_from_file(full_path.to_string()).leak_ref())) if (!(s_minimize_icon = Gfx::Bitmap::load_from_file(full_path.to_string()).leak_ref()))
s_minimize_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/window-minimize.png").leak_ref(); s_minimize_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/downward-triangle.png").leak_ref();
full_path.clear(); full_path.clear();
} }
if (!s_maximize_icon || s_last_title_button_icons_path != icons_path) { if (!s_maximize_icon || s_last_title_button_icons_path != icons_path) {
full_path.append(icons_path); full_path.append(icons_path);
full_path.append("window-maximize.png"); full_path.append("window-maximize.png");
if (!(s_maximize_icon = Gfx::Bitmap::load_from_file(full_path.to_string()).leak_ref())) if (!(s_maximize_icon = Gfx::Bitmap::load_from_file(full_path.to_string()).leak_ref()))
s_maximize_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/window-maximize.png").leak_ref(); s_maximize_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/upward-triangle.png").leak_ref();
full_path.clear(); full_path.clear();
} }
if (!s_restore_icon || s_last_title_button_icons_path != icons_path) { if (!s_restore_icon || s_last_title_button_icons_path != icons_path) {