From 6efdabfc6f8eddc21ed288f11a2b76d09e519acc Mon Sep 17 00:00:00 2001
From: Idan Horowitz <idan.horowitz@gmail.com>
Date: Mon, 28 Dec 2020 00:38:03 +0200
Subject: [PATCH] Base: Rename maximize/minimize icons to a more generic name

This reduces naming confusion when the icons are used for other
use cases that require a triangle shape
---
 Applications/ThemeEditor/PreviewWidget.cpp          |   4 ++--
 .../{window-minimize.png => downward-triangle.png}  | Bin
 .../{window-maximize.png => upward-triangle.png}    | Bin
 Services/WindowServer/Window.cpp                    |   4 ++--
 Services/WindowServer/WindowFrame.cpp               |   4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename Base/res/icons/16x16/{window-minimize.png => downward-triangle.png} (100%)
 rename Base/res/icons/16x16/{window-maximize.png => upward-triangle.png} (100%)

diff --git a/Applications/ThemeEditor/PreviewWidget.cpp b/Applications/ThemeEditor/PreviewWidget.cpp
index a3d90b17ee0c5d..a57da75936940b 100644
--- a/Applications/ThemeEditor/PreviewWidget.cpp
+++ b/Applications/ThemeEditor/PreviewWidget.cpp
@@ -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_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_minimize_bitmap = Gfx::Bitmap::load_from_file("/res/icons/16x16/window-minimize.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/downward-triangle.png");
 
     m_gallery = add<MiniWidgetGallery>();
     set_greedy_for_hits(true);
diff --git a/Base/res/icons/16x16/window-minimize.png b/Base/res/icons/16x16/downward-triangle.png
similarity index 100%
rename from Base/res/icons/16x16/window-minimize.png
rename to Base/res/icons/16x16/downward-triangle.png
diff --git a/Base/res/icons/16x16/window-maximize.png b/Base/res/icons/16x16/upward-triangle.png
similarity index 100%
rename from Base/res/icons/16x16/window-maximize.png
rename to Base/res/icons/16x16/upward-triangle.png
diff --git a/Services/WindowServer/Window.cpp b/Services/WindowServer/Window.cpp
index d1c007dc6a23fb..9bbfada35dc718 100644
--- a/Services/WindowServer/Window.cpp
+++ b/Services/WindowServer/Window.cpp
@@ -54,7 +54,7 @@ static Gfx::Bitmap& minimize_icon()
 {
     static Gfx::Bitmap* 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;
 }
 
@@ -62,7 +62,7 @@ static Gfx::Bitmap& maximize_icon()
 {
     static Gfx::Bitmap* 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;
 }
 
diff --git a/Services/WindowServer/WindowFrame.cpp b/Services/WindowServer/WindowFrame.cpp
index 2bee4bee3c57a0..d89530e59bf763 100644
--- a/Services/WindowServer/WindowFrame.cpp
+++ b/Services/WindowServer/WindowFrame.cpp
@@ -102,14 +102,14 @@ void WindowFrame::set_button_icons()
         full_path.append(icons_path);
         full_path.append("window-minimize.png");
         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();
     }
     if (!s_maximize_icon || s_last_title_button_icons_path != icons_path) {
         full_path.append(icons_path);
         full_path.append("window-maximize.png");
         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();
     }
     if (!s_restore_icon || s_last_title_button_icons_path != icons_path) {