Taskbar: Show default window icons when no icons are set

To be consistent with WindowServer.
lanmonster · Mar 30, 2020 · 7a61ed4 · 7a61ed4
1 parent 8c5fa05
commit 7a61ed4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/Applications/Taskbar/TaskbarWindow.cpp b/Applications/Taskbar/TaskbarWindow.cpp
@@ -56,6 +56,8 @@ TaskbarWindow::TaskbarWindow()
  widget.set_frame_shape(Gfx::FrameShape::Panel);
  widget.set_frame_shadow(Gfx::FrameShadow::Raised);
 
+ m_default_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/window.png");
+
  WindowList::the().aid_create_button = [this](auto& identifier) {
  return create_button(identifier);
  };
@@ -137,6 +139,7 @@ NonnullRefPtr<GUI::Button> TaskbarWindow::create_button(const WindowIdentifier&
  button.set_preferred_size(140, 22);
  button.set_checkable(true);
  button.set_text_alignment(Gfx::TextAlignment::CenterLeft);
+ button.set_icon(*m_default_icon);
  return button;
 }
 

diff --git a/Applications/Taskbar/TaskbarWindow.h b/Applications/Taskbar/TaskbarWindow.h
@@ -42,4 +42,6 @@ class TaskbarWindow final : public GUI::Window {
  NonnullRefPtr<GUI::Button> create_button(const WindowIdentifier&);
 
  virtual void wm_event(GUI::WMEvent&) override;
+
+ RefPtr<Gfx::Bitmap> m_default_icon;
 };