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
cubiclove · Dec 28, 2020 · 6efdabf · 6efdabf
1 parent 26cb083
commit 6efdabf
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git 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 → Base/res/icons/16x16/downward-triangle.png b/Base/res/icons/16x16/window-minimize.png → Base/res/icons/16x16/downward-triangle.png
diff --git a/Base/res/icons/16x16/window-maximize.png → Base/res/icons/16x16/upward-triangle.png b/Base/res/icons/16x16/window-maximize.png → Base/res/icons/16x16/upward-triangle.png
diff --git a/Services/WindowServer/Window.cpp b/Services/WindowServer/Window.cpp
@@ -54,15 +54,15 @@ 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;
 }
 
 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
@@ -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) {