From 0bb2025b69a4f07dfb518023f205ae3e331fedf0 Mon Sep 17 00:00:00 2001 From: thankyouverycool <66646555+thankyouverycool@users.noreply.github.com> Date: Wed, 26 Aug 2020 13:10:18 -0400 Subject: [PATCH] Base: Create /res/icons/serenity for misc. sized system icons --- .../{ => serenity}/changing-filled-radio-circle.png | Bin .../changing-unfilled-radio-circle.png | Bin .../icons/{ => serenity}/filled-radio-circle.png | Bin Base/res/icons/{ => serenity}/treeview-collapse.png | Bin Base/res/icons/{ => serenity}/treeview-expand.png | Bin .../icons/{ => serenity}/unfilled-radio-circle.png | Bin DevTools/VisualBuilder/main.cpp | 2 +- Libraries/LibGUI/TreeView.cpp | 4 ++-- Libraries/LibGfx/ClassicStylePainter.cpp | 8 ++++---- 9 files changed, 7 insertions(+), 7 deletions(-) rename Base/res/icons/{ => serenity}/changing-filled-radio-circle.png (100%) rename Base/res/icons/{ => serenity}/changing-unfilled-radio-circle.png (100%) rename Base/res/icons/{ => serenity}/filled-radio-circle.png (100%) rename Base/res/icons/{ => serenity}/treeview-collapse.png (100%) rename Base/res/icons/{ => serenity}/treeview-expand.png (100%) rename Base/res/icons/{ => serenity}/unfilled-radio-circle.png (100%) diff --git a/Base/res/icons/changing-filled-radio-circle.png b/Base/res/icons/serenity/changing-filled-radio-circle.png similarity index 100% rename from Base/res/icons/changing-filled-radio-circle.png rename to Base/res/icons/serenity/changing-filled-radio-circle.png diff --git a/Base/res/icons/changing-unfilled-radio-circle.png b/Base/res/icons/serenity/changing-unfilled-radio-circle.png similarity index 100% rename from Base/res/icons/changing-unfilled-radio-circle.png rename to Base/res/icons/serenity/changing-unfilled-radio-circle.png diff --git a/Base/res/icons/filled-radio-circle.png b/Base/res/icons/serenity/filled-radio-circle.png similarity index 100% rename from Base/res/icons/filled-radio-circle.png rename to Base/res/icons/serenity/filled-radio-circle.png diff --git a/Base/res/icons/treeview-collapse.png b/Base/res/icons/serenity/treeview-collapse.png similarity index 100% rename from Base/res/icons/treeview-collapse.png rename to Base/res/icons/serenity/treeview-collapse.png diff --git a/Base/res/icons/treeview-expand.png b/Base/res/icons/serenity/treeview-expand.png similarity index 100% rename from Base/res/icons/treeview-expand.png rename to Base/res/icons/serenity/treeview-expand.png diff --git a/Base/res/icons/unfilled-radio-circle.png b/Base/res/icons/serenity/unfilled-radio-circle.png similarity index 100% rename from Base/res/icons/unfilled-radio-circle.png rename to Base/res/icons/serenity/unfilled-radio-circle.png diff --git a/DevTools/VisualBuilder/main.cpp b/DevTools/VisualBuilder/main.cpp index 14e82c2a16..e2530a1c13 100644 --- a/DevTools/VisualBuilder/main.cpp +++ b/DevTools/VisualBuilder/main.cpp @@ -168,7 +168,7 @@ RefPtr make_toolbox_window() auto& radiobutton_button = widget.add(); radiobutton_button.set_button_style(Gfx::ButtonStyle::CoolBar); radiobutton_button.set_tooltip("GRadioButton"); - radiobutton_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/filled-radio-circle.png")); + radiobutton_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/serenity/filled-radio-circle.png")); radiobutton_button.on_click = [](auto) { if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GRadioButton); diff --git a/Libraries/LibGUI/TreeView.cpp b/Libraries/LibGUI/TreeView.cpp index 9ba864cebc..0984bd0628 100644 --- a/Libraries/LibGUI/TreeView.cpp +++ b/Libraries/LibGUI/TreeView.cpp @@ -58,8 +58,8 @@ TreeView::TreeView() set_background_role(ColorRole::Base); set_foreground_role(ColorRole::BaseText); set_column_headers_visible(false); - m_expand_bitmap = Gfx::Bitmap::load_from_file("/res/icons/treeview-expand.png"); - m_collapse_bitmap = Gfx::Bitmap::load_from_file("/res/icons/treeview-collapse.png"); + m_expand_bitmap = Gfx::Bitmap::load_from_file("/res/icons/serenity/treeview-expand.png"); + m_collapse_bitmap = Gfx::Bitmap::load_from_file("/res/icons/serenity/treeview-collapse.png"); } TreeView::~TreeView() diff --git a/Libraries/LibGfx/ClassicStylePainter.cpp b/Libraries/LibGfx/ClassicStylePainter.cpp index ef9de466d9..da62b59358 100644 --- a/Libraries/LibGfx/ClassicStylePainter.cpp +++ b/Libraries/LibGfx/ClassicStylePainter.cpp @@ -336,10 +336,10 @@ static const Gfx::Bitmap& circle_bitmap(bool checked, bool changing) void ClassicStylePainter::paint_radio_button(Painter& painter, const IntRect& rect, const Palette&, bool is_checked, bool is_being_pressed) { if (!s_unfilled_circle_bitmap) { - s_unfilled_circle_bitmap = Bitmap::load_from_file("/res/icons/unfilled-radio-circle.png"); - s_filled_circle_bitmap = Bitmap::load_from_file("/res/icons/filled-radio-circle.png"); - s_changing_filled_circle_bitmap = Bitmap::load_from_file("/res/icons/changing-filled-radio-circle.png"); - s_changing_unfilled_circle_bitmap = Bitmap::load_from_file("/res/icons/changing-unfilled-radio-circle.png"); + s_unfilled_circle_bitmap = Bitmap::load_from_file("/res/icons/serenity/unfilled-radio-circle.png"); + s_filled_circle_bitmap = Bitmap::load_from_file("/res/icons/serenity/filled-radio-circle.png"); + s_changing_filled_circle_bitmap = Bitmap::load_from_file("/res/icons/serenity/changing-filled-radio-circle.png"); + s_changing_unfilled_circle_bitmap = Bitmap::load_from_file("/res/icons/serenity/changing-unfilled-radio-circle.png"); } auto& bitmap = circle_bitmap(is_checked, is_being_pressed);