From 11580babbfb1b8ae0acab2400f11d905c35642f5 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 6 Feb 2020 11:56:38 +0100 Subject: [PATCH] LibDraw: Put all classes in the Gfx namespace I started adding things to a Draw namespace, but it somehow felt really wrong seeing Draw::Rect and Draw::Bitmap, etc. So instead, let's rename the library to LibGfx. :^) --- Applications/About/main.cpp | 4 +- Applications/Browser/main.cpp | 4 +- Applications/Calculator/CalculatorWidget.cpp | 6 +- Applications/Calculator/main.cpp | 4 +- .../ChanViewer/ThreadCatalogModel.cpp | 12 +-- Applications/ChanViewer/main.cpp | 4 +- .../DisplayProperties/DisplayProperties.cpp | 2 +- .../DisplayProperties/DisplayProperties.h | 2 +- .../DisplayProperties/ItemListModel.h | 2 +- Applications/DisplayProperties/main.cpp | 4 +- Applications/FileManager/PropertiesDialog.cpp | 14 ++-- Applications/FileManager/main.cpp | 22 +++--- Applications/FontEditor/FontEditor.cpp | 4 +- Applications/FontEditor/FontEditor.h | 4 +- Applications/FontEditor/GlyphEditorWidget.cpp | 6 +- Applications/FontEditor/GlyphEditorWidget.h | 8 +- Applications/FontEditor/GlyphMapWidget.cpp | 6 +- Applications/FontEditor/GlyphMapWidget.h | 8 +- Applications/FontEditor/main.cpp | 10 +-- Applications/Help/ManualModel.cpp | 4 +- Applications/Help/main.cpp | 4 +- Applications/HexEditor/HexEditor.cpp | 8 +- Applications/HexEditor/HexEditorWidget.cpp | 12 +-- Applications/HexEditor/main.cpp | 2 +- Applications/IRCClient/IRCAppWindow.cpp | 16 ++-- .../IRCClient/IRCChannelMemberListModel.cpp | 2 +- Applications/IRCClient/IRCWindowListModel.cpp | 2 +- Applications/PaintBrush/BucketTool.cpp | 8 +- Applications/PaintBrush/EllipseTool.h | 4 +- Applications/PaintBrush/EraseTool.cpp | 2 +- Applications/PaintBrush/EraseTool.h | 2 +- Applications/PaintBrush/LineTool.cpp | 2 +- Applications/PaintBrush/LineTool.h | 4 +- Applications/PaintBrush/PaintableWidget.cpp | 4 +- Applications/PaintBrush/PaintableWidget.h | 8 +- Applications/PaintBrush/PaletteWidget.cpp | 16 ++-- Applications/PaintBrush/PenTool.h | 2 +- Applications/PaintBrush/RectangleTool.h | 4 +- Applications/PaintBrush/SprayTool.cpp | 2 +- Applications/PaintBrush/SprayTool.h | 2 +- Applications/PaintBrush/ToolboxWidget.cpp | 6 +- Applications/PaintBrush/main.cpp | 6 +- Applications/Piano/KeysWidget.cpp | 13 ++-- Applications/Piano/KeysWidget.h | 2 +- Applications/Piano/KnobsWidget.cpp | 4 +- Applications/Piano/RollWidget.cpp | 4 +- Applications/Piano/WaveWidget.cpp | 4 +- Applications/Piano/main.cpp | 4 +- Applications/QuickShow/QSWidget.cpp | 8 +- Applications/QuickShow/QSWidget.h | 12 +-- Applications/QuickShow/main.cpp | 2 +- Applications/SoundPlayer/SampleWidget.cpp | 4 +- .../SoundPlayer/SoundPlayerWidget.cpp | 16 ++-- Applications/SoundPlayer/SoundPlayerWidget.h | 4 +- Applications/SoundPlayer/main.cpp | 4 +- Applications/SystemMonitor/DevicesModel.cpp | 10 +-- Applications/SystemMonitor/GraphWidget.cpp | 8 +- .../SystemMonitor/MemoryStatsWidget.cpp | 6 +- .../SystemMonitor/NetworkStatisticsWidget.cpp | 38 +++++----- .../ProcessFileDescriptorMapWidget.cpp | 18 ++--- .../SystemMonitor/ProcessMemoryMapWidget.cpp | 16 ++-- Applications/SystemMonitor/ProcessModel.cpp | 64 ++++++++-------- Applications/SystemMonitor/ProcessModel.h | 8 +- .../ProcessUnveiledPathsWidget.cpp | 4 +- Applications/SystemMonitor/main.cpp | 50 ++++++------- Applications/Taskbar/TaskbarWindow.cpp | 20 ++--- Applications/Taskbar/TaskbarWindow.h | 2 +- Applications/Taskbar/WindowList.h | 8 +- Applications/Terminal/main.cpp | 8 +- Applications/TextEditor/TextEditorWidget.cpp | 10 +-- Applications/TextEditor/main.cpp | 2 +- Applications/Welcome/TextWidget.cpp | 6 +- Applications/Welcome/TextWidget.h | 6 +- Applications/Welcome/main.cpp | 18 ++--- Demos/Fire/Fire.cpp | 6 +- DevTools/HackStudio/CursorTool.cpp | 2 +- DevTools/HackStudio/CursorTool.h | 10 +-- DevTools/HackStudio/Editor.cpp | 2 +- DevTools/HackStudio/Editor.h | 2 +- DevTools/HackStudio/EditorWrapper.cpp | 6 +- DevTools/HackStudio/FindInFilesWidget.cpp | 2 +- DevTools/HackStudio/FormEditorWidget.cpp | 4 +- DevTools/HackStudio/Locator.cpp | 12 +-- DevTools/HackStudio/ProcessStateWidget.cpp | 8 +- DevTools/HackStudio/Project.cpp | 12 +-- DevTools/HackStudio/WidgetTreeModel.cpp | 2 +- DevTools/HackStudio/main.cpp | 28 +++---- DevTools/IPCCompiler/main.cpp | 2 +- DevTools/Inspector/RemoteObjectGraphModel.cpp | 4 +- DevTools/ProfileViewer/ProfileModel.cpp | 6 +- .../ProfileViewer/ProfileTimelineWidget.cpp | 4 +- DevTools/VisualBuilder/VBForm.cpp | 6 +- DevTools/VisualBuilder/VBForm.h | 6 +- DevTools/VisualBuilder/VBWidget.cpp | 4 +- DevTools/VisualBuilder/VBWidget.h | 6 +- .../VisualBuilder/VBWidgetPropertyModel.cpp | 4 +- DevTools/VisualBuilder/main.cpp | 42 +++++------ Games/Minesweeper/Field.cpp | 20 ++--- Games/Minesweeper/Field.h | 16 ++-- Games/Minesweeper/main.cpp | 10 +-- Games/Snake/SnakeGame.cpp | 12 +-- Games/Snake/SnakeGame.h | 2 +- Games/Snake/main.cpp | 4 +- Libraries/LibDraw/CharacterBitmap.cpp | 4 + Libraries/LibDraw/CharacterBitmap.h | 6 +- Libraries/LibDraw/Color.h | 6 ++ Libraries/LibDraw/DisjointRectSet.cpp | 4 + Libraries/LibDraw/DisjointRectSet.h | 4 + Libraries/LibDraw/Emoji.cpp | 10 ++- Libraries/LibDraw/Emoji.h | 8 +- Libraries/LibDraw/FloatPoint.h | 8 +- Libraries/LibDraw/FloatRect.h | 6 ++ Libraries/LibDraw/FloatSize.h | 8 +- Libraries/LibDraw/Font.cpp | 12 ++- Libraries/LibDraw/Font.h | 10 ++- Libraries/LibDraw/GIFLoader.cpp | 12 ++- Libraries/LibDraw/GIFLoader.h | 10 ++- Libraries/LibDraw/GraphicsBitmap.cpp | 50 +++++++------ Libraries/LibDraw/GraphicsBitmap.h | 52 +++++++------ Libraries/LibDraw/ImageDecoder.cpp | 3 + Libraries/LibDraw/ImageDecoder.h | 10 ++- Libraries/LibDraw/Orientation.h | 6 ++ Libraries/LibDraw/PNGLoader.cpp | 20 +++-- Libraries/LibDraw/PNGLoader.h | 10 ++- Libraries/LibDraw/Painter.cpp | 74 ++++++++++--------- Libraries/LibDraw/Painter.h | 30 ++++---- Libraries/LibDraw/Palette.cpp | 4 + Libraries/LibDraw/Palette.h | 6 ++ Libraries/LibDraw/Point.h | 6 ++ Libraries/LibDraw/Rect.h | 6 ++ Libraries/LibDraw/Size.h | 9 ++- Libraries/LibDraw/StylePainter.cpp | 22 +++--- Libraries/LibDraw/StylePainter.h | 4 + Libraries/LibDraw/SystemTheme.cpp | 4 + Libraries/LibDraw/SystemTheme.h | 6 ++ Libraries/LibDraw/TextAlignment.h | 4 + Libraries/LibDraw/TextElision.h | 4 + Libraries/LibDraw/Triangle.h | 4 + Libraries/LibGUI/GAboutDialog.cpp | 6 +- Libraries/LibGUI/GAboutDialog.h | 6 +- Libraries/LibGUI/GAbstractButton.cpp | 8 +- Libraries/LibGUI/GAbstractButton.h | 2 +- Libraries/LibGUI/GAbstractTableView.cpp | 18 ++--- Libraries/LibGUI/GAbstractTableView.h | 12 +-- Libraries/LibGUI/GAbstractView.cpp | 4 +- Libraries/LibGUI/GAbstractView.h | 8 +- Libraries/LibGUI/GAction.cpp | 30 ++++---- Libraries/LibGUI/GAction.h | 14 ++-- Libraries/LibGUI/GApplication.cpp | 8 +- Libraries/LibGUI/GApplication.h | 8 +- Libraries/LibGUI/GButton.cpp | 6 +- Libraries/LibGUI/GButton.h | 20 ++--- Libraries/LibGUI/GCheckBox.cpp | 8 +- Libraries/LibGUI/GColumnsView.cpp | 10 +-- Libraries/LibGUI/GColumnsView.h | 2 +- Libraries/LibGUI/GDesktop.cpp | 2 +- Libraries/LibGUI/GDesktop.h | 6 +- Libraries/LibGUI/GDragOperation.cpp | 2 +- Libraries/LibGUI/GDragOperation.h | 8 +- Libraries/LibGUI/GEvent.h | 54 +++++++------- Libraries/LibGUI/GFilePicker.cpp | 14 ++-- Libraries/LibGUI/GFileSystemModel.cpp | 28 +++---- Libraries/LibGUI/GFileSystemModel.h | 2 +- Libraries/LibGUI/GFontDatabase.cpp | 6 +- Libraries/LibGUI/GFontDatabase.h | 4 +- Libraries/LibGUI/GFrame.cpp | 4 +- Libraries/LibGUI/GFrame.h | 14 ++-- Libraries/LibGUI/GGroupBox.cpp | 4 +- Libraries/LibGUI/GIcon.cpp | 14 ++-- Libraries/LibGUI/GIcon.h | 14 ++-- Libraries/LibGUI/GItemView.cpp | 14 ++-- Libraries/LibGUI/GItemView.h | 12 +-- Libraries/LibGUI/GJsonArrayModel.h | 6 +- Libraries/LibGUI/GLabel.cpp | 8 +- Libraries/LibGUI/GLabel.h | 18 +++-- Libraries/LibGUI/GListView.cpp | 8 +- Libraries/LibGUI/GListView.h | 4 +- Libraries/LibGUI/GMenu.cpp | 6 +- Libraries/LibGUI/GMenu.h | 4 +- Libraries/LibGUI/GMessageBox.cpp | 8 +- Libraries/LibGUI/GMessageBox.h | 2 +- Libraries/LibGUI/GModel.h | 6 +- Libraries/LibGUI/GPainter.cpp | 4 +- Libraries/LibGUI/GPainter.h | 4 +- Libraries/LibGUI/GProgressBar.cpp | 6 +- Libraries/LibGUI/GRadioButton.cpp | 4 +- Libraries/LibGUI/GResizeCorner.cpp | 2 +- Libraries/LibGUI/GResizeCorner.h | 2 +- Libraries/LibGUI/GScrollBar.cpp | 22 +++--- Libraries/LibGUI/GScrollBar.h | 2 +- Libraries/LibGUI/GScrollableWidget.cpp | 12 +-- Libraries/LibGUI/GScrollableWidget.h | 16 ++-- Libraries/LibGUI/GSlider.cpp | 4 +- Libraries/LibGUI/GSlider.h | 2 +- Libraries/LibGUI/GSplitter.h | 6 +- Libraries/LibGUI/GStatusBar.cpp | 8 +- Libraries/LibGUI/GTabWidget.cpp | 14 ++-- Libraries/LibGUI/GTabWidget.h | 6 +- Libraries/LibGUI/GTableView.cpp | 4 +- Libraries/LibGUI/GTextDocument.h | 2 +- Libraries/LibGUI/GTextEditor.cpp | 36 ++++----- Libraries/LibGUI/GTextEditor.h | 8 +- Libraries/LibGUI/GToolBar.cpp | 4 +- Libraries/LibGUI/GTreeView.cpp | 24 +++--- Libraries/LibGUI/GTreeView.h | 6 +- Libraries/LibGUI/GVariant.cpp | 14 ++-- Libraries/LibGUI/GVariant.h | 20 ++--- Libraries/LibGUI/GWidget.cpp | 16 ++-- Libraries/LibGUI/GWidget.h | 34 +++++---- Libraries/LibGUI/GWindow.cpp | 22 +++--- Libraries/LibGUI/GWindow.h | 38 +++++----- Libraries/LibGUI/GWindowServerConnection.cpp | 2 +- Libraries/LibHTML/CSS/StyleProperties.cpp | 6 +- Libraries/LibHTML/CSS/StyleProperties.h | 6 +- Libraries/LibHTML/CSS/StyleValue.cpp | 2 +- Libraries/LibHTML/CSS/StyleValue.h | 4 +- Libraries/LibHTML/DOM/Document.cpp | 2 +- Libraries/LibHTML/DOM/Document.h | 7 +- Libraries/LibHTML/DOM/HTMLImageElement.cpp | 6 +- Libraries/LibHTML/DOM/HTMLImageElement.h | 6 +- Libraries/LibHTML/DOM/HTMLInputElement.cpp | 4 +- Libraries/LibHTML/DOMTreeModel.cpp | 6 +- Libraries/LibHTML/FontCache.cpp | 4 +- Libraries/LibHTML/FontCache.h | 8 +- Libraries/LibHTML/Frame.cpp | 6 +- Libraries/LibHTML/Frame.h | 14 ++-- Libraries/LibHTML/HtmlView.cpp | 6 +- Libraries/LibHTML/Layout/LayoutBlock.cpp | 2 +- Libraries/LibHTML/Layout/LayoutBlock.h | 2 +- Libraries/LibHTML/Layout/LayoutBox.cpp | 2 +- Libraries/LibHTML/Layout/LayoutBox.h | 2 +- Libraries/LibHTML/Layout/LayoutDocument.cpp | 2 +- Libraries/LibHTML/Layout/LayoutDocument.h | 2 +- Libraries/LibHTML/Layout/LayoutImage.cpp | 8 +- Libraries/LibHTML/Layout/LayoutNode.cpp | 2 +- Libraries/LibHTML/Layout/LayoutNode.h | 2 +- Libraries/LibHTML/Layout/LayoutText.cpp | 2 +- Libraries/LibHTML/RenderingContext.h | 4 +- Libraries/LibVT/TerminalWidget.cpp | 18 ++--- Libraries/LibVT/TerminalWidget.h | 8 +- MenuApplets/Audio/main.cpp | 8 +- MenuApplets/Clock/main.cpp | 4 +- Servers/WindowServer/WSButton.cpp | 10 +-- Servers/WindowServer/WSButton.h | 21 +++--- Servers/WindowServer/WSClientConnection.cpp | 18 ++--- Servers/WindowServer/WSClientConnection.h | 2 +- Servers/WindowServer/WSCompositor.cpp | 50 ++++++------- Servers/WindowServer/WSCompositor.h | 27 ++++--- Servers/WindowServer/WSCursor.cpp | 6 +- Servers/WindowServer/WSCursor.h | 12 +-- Servers/WindowServer/WSEvent.h | 12 +-- Servers/WindowServer/WSMenu.cpp | 52 ++++++------- Servers/WindowServer/WSMenu.h | 27 ++++--- Servers/WindowServer/WSMenuItem.cpp | 2 +- Servers/WindowServer/WSMenuItem.h | 21 +++--- Servers/WindowServer/WSMenuManager.cpp | 20 ++--- Servers/WindowServer/WSMenuManager.h | 4 +- Servers/WindowServer/WSScreen.cpp | 2 +- Servers/WindowServer/WSScreen.h | 10 +-- Servers/WindowServer/WSWindow.cpp | 16 ++-- Servers/WindowServer/WSWindow.h | 70 +++++++++--------- Servers/WindowServer/WSWindowFrame.cpp | 42 +++++------ Servers/WindowServer/WSWindowFrame.h | 15 ++-- Servers/WindowServer/WSWindowManager.cpp | 54 +++++++------- Servers/WindowServer/WSWindowManager.h | 48 ++++++------ Servers/WindowServer/WSWindowSwitcher.cpp | 14 ++-- Servers/WindowServer/WSWindowSwitcher.h | 5 +- Servers/WindowServer/main.cpp | 6 +- Userland/html.cpp | 4 +- 269 files changed, 1513 insertions(+), 1315 deletions(-) diff --git a/Applications/About/main.cpp b/Applications/About/main.cpp index 0aa5cf42d9e8dc..2e8eeba91e7f66 100644 --- a/Applications/About/main.cpp +++ b/Applications/About/main.cpp @@ -69,12 +69,12 @@ int main(int argc, char** argv) widget->layout()->set_spacing(8); auto icon_label = GUI::Label::construct(widget); - icon_label->set_icon(GraphicsBitmap::load_from_file("/res/icons/serenity.png")); + icon_label->set_icon(Gfx::Bitmap::load_from_file("/res/icons/serenity.png")); icon_label->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); icon_label->set_preferred_size(icon_label->icon()->size()); auto label = GUI::Label::construct(widget); - label->set_font(Font::default_bold_font()); + label->set_font(Gfx::Font::default_bold_font()); label->set_text("SerenityOS"); label->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); label->set_preferred_size(0, 11); diff --git a/Applications/Browser/main.cpp b/Applications/Browser/main.cpp index 52944115e49191..5877772f0fc77f 100644 --- a/Applications/Browser/main.cpp +++ b/Applications/Browser/main.cpp @@ -235,13 +235,13 @@ int main(int argc, char** argv) auto help_menu = GUI::Menu::construct("Help"); help_menu->add_action(GUI::Action::create("About", [&](const GUI::Action&) { - GUI::AboutDialog::show("Browser", GraphicsBitmap::load_from_file("/res/icons/32x32/filetype-html.png"), window); + GUI::AboutDialog::show("Browser", Gfx::Bitmap::load_from_file("/res/icons/32x32/filetype-html.png"), window); })); menubar->add_menu(move(help_menu)); app.set_menubar(move(menubar)); - window->set_icon(GraphicsBitmap::load_from_file("/res/icons/16x16/filetype-html.png")); + window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-html.png")); window->set_title("Browser"); window->set_main_widget(widget); diff --git a/Applications/Calculator/CalculatorWidget.cpp b/Applications/Calculator/CalculatorWidget.cpp index 736cd4ecbf81ef..c04713ba4a6a12 100644 --- a/Applications/Calculator/CalculatorWidget.cpp +++ b/Applications/Calculator/CalculatorWidget.cpp @@ -37,13 +37,13 @@ CalculatorWidget::CalculatorWidget(GUI::Widget* parent) m_entry = GUI::TextBox::construct(this); m_entry->set_relative_rect(5, 5, 244, 26); - m_entry->set_text_alignment(TextAlignment::CenterRight); + m_entry->set_text_alignment(Gfx::TextAlignment::CenterRight); m_label = GUI::Label::construct(this); m_label->set_relative_rect(12, 42, 27, 27); m_label->set_foreground_color(Color::NamedColor::Red); - m_label->set_frame_shadow(FrameShadow::Sunken); - m_label->set_frame_shape(FrameShape::Container); + m_label->set_frame_shadow(Gfx::FrameShadow::Sunken); + m_label->set_frame_shape(Gfx::FrameShape::Container); m_label->set_frame_thickness(2); update_display(); diff --git a/Applications/Calculator/main.cpp b/Applications/Calculator/main.cpp index fb8f035e0b763f..7f19003c8ca50a 100644 --- a/Applications/Calculator/main.cpp +++ b/Applications/Calculator/main.cpp @@ -63,7 +63,7 @@ int main(int argc, char** argv) window->set_main_widget(calc_widget); window->show(); - window->set_icon(GraphicsBitmap::load_from_file("/res/icons/16x16/app-calculator.png")); + window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-calculator.png")); auto menubar = make(); @@ -76,7 +76,7 @@ int main(int argc, char** argv) auto help_menu = GUI::Menu::construct("Help"); help_menu->add_action(GUI::Action::create("About", [&](const GUI::Action&) { - GUI::AboutDialog::show("Calculator", load_png("/res/icons/16x16/app-calculator.png"), window); + GUI::AboutDialog::show("Calculator", Gfx::load_png("/res/icons/16x16/app-calculator.png"), window); })); menubar->add_menu(move(help_menu)); diff --git a/Applications/ChanViewer/ThreadCatalogModel.cpp b/Applications/ChanViewer/ThreadCatalogModel.cpp index 3ba7ed527ca9c4..d0519c4ff28659 100644 --- a/Applications/ChanViewer/ThreadCatalogModel.cpp +++ b/Applications/ChanViewer/ThreadCatalogModel.cpp @@ -129,17 +129,17 @@ GUI::Model::ColumnMetadata ThreadCatalogModel::column_metadata(int column) const { switch (column) { case Column::ThreadNumber: - return { 70, TextAlignment::CenterRight }; + return { 70, Gfx::TextAlignment::CenterRight }; case Column::Subject: - return { 170, TextAlignment::CenterLeft }; + return { 170, Gfx::TextAlignment::CenterLeft }; case Column::Text: - return { 270, TextAlignment::CenterLeft }; + return { 270, Gfx::TextAlignment::CenterLeft }; case Column::ReplyCount: - return { 45, TextAlignment::CenterRight }; + return { 45, Gfx::TextAlignment::CenterRight }; case Column::ImageCount: - return { 40, TextAlignment::CenterRight }; + return { 40, Gfx::TextAlignment::CenterRight }; case Column::PostTime: - return { 120, TextAlignment::CenterLeft }; + return { 120, Gfx::TextAlignment::CenterLeft }; default: ASSERT_NOT_REACHED(); } diff --git a/Applications/ChanViewer/main.cpp b/Applications/ChanViewer/main.cpp index 99e1be7cc559b8..b8ded65910bf9f 100644 --- a/Applications/ChanViewer/main.cpp +++ b/Applications/ChanViewer/main.cpp @@ -55,7 +55,7 @@ int main(int argc, char** argv) auto window = GUI::Window::construct(); window->set_title("ChanViewer"); window->set_rect(100, 100, 800, 500); - window->set_icon(load_png("/res/icons/16x16/app-chanviewer.png")); + window->set_icon(Gfx::load_png("/res/icons/16x16/app-chanviewer.png")); auto widget = GUI::Widget::construct(); window->set_main_widget(widget); @@ -104,7 +104,7 @@ int main(int argc, char** argv) auto help_menu = GUI::Menu::construct("Help"); help_menu->add_action(GUI::Action::create("About", [&](const GUI::Action&) { - GUI::AboutDialog::show("ChanViewer", load_png("/res/icons/32x32/app-chanviewer.png"), window); + GUI::AboutDialog::show("ChanViewer", Gfx::load_png("/res/icons/32x32/app-chanviewer.png"), window); })); menubar->add_menu(move(help_menu)); diff --git a/Applications/DisplayProperties/DisplayProperties.cpp b/Applications/DisplayProperties/DisplayProperties.cpp index 4ef21805afd7da..57d5639d71e8b6 100644 --- a/Applications/DisplayProperties/DisplayProperties.cpp +++ b/Applications/DisplayProperties/DisplayProperties.cpp @@ -151,7 +151,7 @@ void DisplayPropertiesWidget::create_frame() m_selected_wallpaper = m_wallpapers.at(index.row()); builder.append("/res/wallpapers/"); builder.append(m_selected_wallpaper); - m_wallpaper_preview->set_icon(load_png(builder.to_string())); + m_wallpaper_preview->set_icon(Gfx::load_png(builder.to_string())); m_wallpaper_preview->set_should_stretch_icon(true); }; diff --git a/Applications/DisplayProperties/DisplayProperties.h b/Applications/DisplayProperties/DisplayProperties.h index 1f142d0ef9fcd3..0b678ee7d306fb 100644 --- a/Applications/DisplayProperties/DisplayProperties.h +++ b/Applications/DisplayProperties/DisplayProperties.h @@ -71,6 +71,6 @@ class DisplayPropertiesWidget final { Vector m_wallpapers; RefPtr m_wallpaper_preview; - Size m_selected_resolution; + Gfx::Size m_selected_resolution; String m_selected_wallpaper; }; diff --git a/Applications/DisplayProperties/ItemListModel.h b/Applications/DisplayProperties/ItemListModel.h index 74cee2c34603da..8b675c3fa78035 100644 --- a/Applications/DisplayProperties/ItemListModel.h +++ b/Applications/DisplayProperties/ItemListModel.h @@ -54,7 +54,7 @@ class ItemListModel final : public GUI::Model { virtual ColumnMetadata column_metadata(int) const override { - return { 70, TextAlignment::CenterLeft }; + return { 70, Gfx::TextAlignment::CenterLeft }; } virtual GUI::Variant data(const GUI::ModelIndex& index, Role role = Role::Display) const override diff --git a/Applications/DisplayProperties/main.cpp b/Applications/DisplayProperties/main.cpp index 409e8f14d5fdc3..3dea4c6424a2f9 100644 --- a/Applications/DisplayProperties/main.cpp +++ b/Applications/DisplayProperties/main.cpp @@ -58,7 +58,7 @@ int main(int argc, char** argv) window->resize(400, 448); window->set_resizable(false); window->set_main_widget(instance.root_widget()); - window->set_icon(load_png("/res/icons/16x16/app-display-properties.png")); + window->set_icon(Gfx::load_png("/res/icons/16x16/app-display-properties.png")); // Let's create the menubar first auto menubar = make(); @@ -71,7 +71,7 @@ int main(int argc, char** argv) auto help_menu = GUI::Menu::construct("Help"); help_menu->add_action(GUI::Action::create("About", [&](const GUI::Action&) { - GUI::AboutDialog::show("Display Properties", load_png("/res/icons/32x32/app-display-properties.png"), window); + GUI::AboutDialog::show("Display Properties", Gfx::load_png("/res/icons/32x32/app-display-properties.png"), window); })); menubar->add_menu(move(help_menu)); diff --git a/Applications/FileManager/PropertiesDialog.cpp b/Applications/FileManager/PropertiesDialog.cpp index 494f53309fe470..8698ea06f06108 100644 --- a/Applications/FileManager/PropertiesDialog.cpp +++ b/Applications/FileManager/PropertiesDialog.cpp @@ -87,7 +87,7 @@ PropertiesDialog::PropertiesDialog(GUI::FileSystemModel& model, String path, boo } }; - set_icon(GraphicsBitmap::load_from_file("/res/icons/16x16/properties.png")); + set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/properties.png")); make_divider(general_tab); struct stat st; @@ -154,7 +154,7 @@ PropertiesDialog::~PropertiesDialog() {} void PropertiesDialog::update() { - m_icon->set_icon(const_cast(m_model.icon_for_file(m_mode, m_name).bitmap_for_size(32))); + m_icon->set_icon(const_cast(m_model.icon_for_file(m_mode, m_name).bitmap_for_size(32))); set_title(String::format("Properties of \"%s\"", m_name.characters())); } @@ -219,7 +219,7 @@ void PropertiesDialog::make_permission_checkboxes(NonnullRefPtr& pa widget->layout()->set_spacing(10); auto label = GUI::Label::construct(label_string, widget); - label->set_text_alignment(TextAlignment::CenterLeft); + label->set_text_alignment(Gfx::TextAlignment::CenterLeft); auto box_read = GUI::CheckBox::construct("Read", widget); box_read->set_checked(mode & masks.read); @@ -248,10 +248,10 @@ void PropertiesDialog::make_property_value_pairs(const Vector label_container->layout()->set_spacing(12); auto label_property = GUI::Label::construct(pair.property, label_container); - label_property->set_text_alignment(TextAlignment::CenterLeft); + label_property->set_text_alignment(Gfx::TextAlignment::CenterLeft); label_property->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - GUI::Label::construct(pair.value, label_container)->set_text_alignment(TextAlignment::CenterLeft); + GUI::Label::construct(pair.value, label_container)->set_text_alignment(Gfx::TextAlignment::CenterLeft); max_width = max(max_width, label_property->font().width(pair.property)); property_labels.append(label_property); @@ -276,8 +276,8 @@ void PropertiesDialog::make_divider(NonnullRefPtr& parent) auto divider = GUI::Frame::construct(parent.ptr()); divider->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); divider->set_preferred_size({ 0, 2 }); - divider->set_frame_shape(FrameShape::HorizontalLine); - divider->set_frame_shadow(FrameShadow::Sunken); + divider->set_frame_shape(Gfx::FrameShape::HorizontalLine); + divider->set_frame_shadow(Gfx::FrameShadow::Sunken); divider->set_frame_thickness(2); parent->layout()->add_spacer(); diff --git a/Applications/FileManager/main.cpp b/Applications/FileManager/main.cpp index cddefb11514dd4..328ad1df1ff634 100644 --- a/Applications/FileManager/main.cpp +++ b/Applications/FileManager/main.cpp @@ -126,8 +126,8 @@ int main(int argc, char** argv) progressbar->set_caption("Generating thumbnails: "); progressbar->set_format(GUI::ProgressBar::Format::ValueSlashMax); progressbar->set_visible(false); - progressbar->set_frame_shape(FrameShape::Panel); - progressbar->set_frame_shadow(FrameShadow::Sunken); + progressbar->set_frame_shape(Gfx::FrameShape::Panel); + progressbar->set_frame_shadow(Gfx::FrameShadow::Sunken); progressbar->set_frame_thickness(1); location_textbox->on_return_pressed = [&] { @@ -164,11 +164,11 @@ int main(int argc, char** argv) auto tree_view_directory_context_menu = GUI::Menu::construct("Tree View Directory"); auto tree_view_context_menu = GUI::Menu::construct("Tree View"); - auto open_parent_directory_action = GUI::Action::create("Open parent directory", { Mod_Alt, Key_Up }, GraphicsBitmap::load_from_file("/res/icons/16x16/open-parent-directory.png"), [&](const GUI::Action&) { + auto open_parent_directory_action = GUI::Action::create("Open parent directory", { Mod_Alt, Key_Up }, Gfx::Bitmap::load_from_file("/res/icons/16x16/open-parent-directory.png"), [&](const GUI::Action&) { directory_view->open_parent_directory(); }); - auto mkdir_action = GUI::Action::create("New directory...", { Mod_Ctrl | Mod_Shift, Key_N }, GraphicsBitmap::load_from_file("/res/icons/16x16/mkdir.png"), [&](const GUI::Action&) { + auto mkdir_action = GUI::Action::create("New directory...", { Mod_Ctrl | Mod_Shift, Key_N }, Gfx::Bitmap::load_from_file("/res/icons/16x16/mkdir.png"), [&](const GUI::Action&) { auto input_box = GUI::InputBox::construct("Enter name:", "New directory", window); if (input_box->exec() == GUI::InputBox::ExecOK && !input_box->text_value().is_empty()) { auto new_dir_path = canonicalized_path( @@ -188,7 +188,7 @@ int main(int argc, char** argv) RefPtr view_as_icons_action; RefPtr view_as_columns_action; - view_as_table_action = GUI::Action::create("Table view", { Mod_Ctrl, KeyCode::Key_L }, GraphicsBitmap::load_from_file("/res/icons/16x16/table-view.png"), [&](const GUI::Action&) { + view_as_table_action = GUI::Action::create("Table view", { Mod_Ctrl, KeyCode::Key_L }, Gfx::Bitmap::load_from_file("/res/icons/16x16/table-view.png"), [&](const GUI::Action&) { directory_view->set_view_mode(DirectoryView::ViewMode::List); view_as_table_action->set_checked(true); @@ -197,7 +197,7 @@ int main(int argc, char** argv) }, window); view_as_table_action->set_checkable(true); - view_as_icons_action = GUI::Action::create("Icon view", { Mod_Ctrl, KeyCode::Key_I }, GraphicsBitmap::load_from_file("/res/icons/16x16/icon-view.png"), [&](const GUI::Action&) { + view_as_icons_action = GUI::Action::create("Icon view", { Mod_Ctrl, KeyCode::Key_I }, Gfx::Bitmap::load_from_file("/res/icons/16x16/icon-view.png"), [&](const GUI::Action&) { directory_view->set_view_mode(DirectoryView::ViewMode::Icon); view_as_icons_action->set_checked(true); @@ -206,7 +206,7 @@ int main(int argc, char** argv) }, window); view_as_icons_action->set_checkable(true); - view_as_columns_action = GUI::Action::create("Columns view", GraphicsBitmap::load_from_file("/res/icons/16x16/columns-view.png"), [&](const GUI::Action&) { + view_as_columns_action = GUI::Action::create("Columns view", Gfx::Bitmap::load_from_file("/res/icons/16x16/columns-view.png"), [&](const GUI::Action&) { directory_view->set_view_mode(DirectoryView::ViewMode::Columns); view_as_columns_action->set_checked(true); @@ -298,7 +298,7 @@ int main(int argc, char** argv) }; auto properties_action - = GUI::Action::create("Properties...", { Mod_Alt, Key_Return }, GraphicsBitmap::load_from_file("/res/icons/16x16/properties.png"), [&](const GUI::Action& action) { + = GUI::Action::create("Properties...", { Mod_Alt, Key_Return }, Gfx::Bitmap::load_from_file("/res/icons/16x16/properties.png"), [&](const GUI::Action& action) { auto& model = directory_view->model(); String path; Vector selected; @@ -445,7 +445,7 @@ int main(int argc, char** argv) auto help_menu = GUI::Menu::construct("Help"); help_menu->add_action(GUI::Action::create("About", [&](const GUI::Action&) { - GUI::AboutDialog::show("File Manager", load_png("/res/icons/32x32/filetype-folder.png"), window); + GUI::AboutDialog::show("File Manager", Gfx::load_png("/res/icons/32x32/filetype-folder.png"), window); })); menubar->add_menu(move(help_menu)); @@ -502,7 +502,7 @@ int main(int argc, char** argv) delete_action->set_enabled(!view.selection().is_empty()); }; - auto open_in_text_editor_action = GUI::Action::create("Open in TextEditor...", GraphicsBitmap::load_from_file("/res/icons/TextEditor16.png"), [&](auto&) { + auto open_in_text_editor_action = GUI::Action::create("Open in TextEditor...", Gfx::Bitmap::load_from_file("/res/icons/TextEditor16.png"), [&](auto&) { for (auto& path : selected_file_paths()) { if (!fork()) { int rc = execl("/bin/TextEditor", "TextEditor", path.characters(), nullptr); @@ -587,7 +587,7 @@ int main(int argc, char** argv) window->set_main_widget(widget); window->show(); - window->set_icon(load_png("/res/icons/16x16/filetype-folder.png")); + window->set_icon(Gfx::load_png("/res/icons/16x16/filetype-folder.png")); // Read direcory read mode from config. auto dir_view_mode = config->read_entry("DirectoryView", "ViewMode", "Icon"); diff --git a/Applications/FontEditor/FontEditor.cpp b/Applications/FontEditor/FontEditor.cpp index 815ab629d5dca6..dece1538adf048 100644 --- a/Applications/FontEditor/FontEditor.cpp +++ b/Applications/FontEditor/FontEditor.cpp @@ -38,7 +38,7 @@ #include #include -FontEditorWidget::FontEditorWidget(const String& path, RefPtr&& edited_font, GUI::Widget* parent) +FontEditorWidget::FontEditorWidget(const String& path, RefPtr&& edited_font, GUI::Widget* parent) : GUI::Widget(parent) , m_edited_font(move(edited_font)) { @@ -85,7 +85,7 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr&& edited_fon exit(0); }; - m_ui->info_label->set_text_alignment(TextAlignment::CenterLeft); + m_ui->info_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); m_ui->demo_label_1->set_font(m_edited_font); m_ui->demo_label_1->set_text("quick fox jumps nightly above wizard."); diff --git a/Applications/FontEditor/FontEditor.h b/Applications/FontEditor/FontEditor.h index 163ad3efd88852..82f609c3134cb9 100644 --- a/Applications/FontEditor/FontEditor.h +++ b/Applications/FontEditor/FontEditor.h @@ -40,8 +40,8 @@ class FontEditorWidget final : public GUI::Widget { virtual ~FontEditorWidget() override; private: - FontEditorWidget(const String& path, RefPtr&&, GUI::Widget* parent = nullptr); - RefPtr m_edited_font; + FontEditorWidget(const String& path, RefPtr&&, GUI::Widget* parent = nullptr); + RefPtr m_edited_font; GlyphMapWidget* m_glyph_map_widget { nullptr }; GlyphEditorWidget* m_glyph_editor_widget { nullptr }; diff --git a/Applications/FontEditor/GlyphEditorWidget.cpp b/Applications/FontEditor/GlyphEditorWidget.cpp index 44ac553de91892..5bb134142389c0 100644 --- a/Applications/FontEditor/GlyphEditorWidget.cpp +++ b/Applications/FontEditor/GlyphEditorWidget.cpp @@ -27,13 +27,13 @@ #include "GlyphEditorWidget.h" #include -GlyphEditorWidget::GlyphEditorWidget(Font& mutable_font, GUI::Widget* parent) +GlyphEditorWidget::GlyphEditorWidget(Gfx::Font& mutable_font, GUI::Widget* parent) : GUI::Frame(parent) , m_font(mutable_font) { set_frame_thickness(2); - set_frame_shadow(FrameShadow::Sunken); - set_frame_shape(FrameShape::Container); + set_frame_shadow(Gfx::FrameShadow::Sunken); + set_frame_shape(Gfx::FrameShape::Container); set_relative_rect({ 0, 0, preferred_width(), preferred_height() }); } diff --git a/Applications/FontEditor/GlyphEditorWidget.h b/Applications/FontEditor/GlyphEditorWidget.h index a54258aabdc145..caf4c79447951d 100644 --- a/Applications/FontEditor/GlyphEditorWidget.h +++ b/Applications/FontEditor/GlyphEditorWidget.h @@ -38,20 +38,20 @@ class GlyphEditorWidget final : public GUI::Frame { int preferred_width() const; int preferred_height() const; - Font& font() { return *m_font; } - const Font& font() const { return *m_font; } + Gfx::Font& font() { return *m_font; } + const Gfx::Font& font() const { return *m_font; } Function on_glyph_altered; private: - GlyphEditorWidget(Font&, GUI::Widget* parent); + GlyphEditorWidget(Gfx::Font&, GUI::Widget* parent); virtual void paint_event(GUI::PaintEvent&) override; virtual void mousedown_event(GUI::MouseEvent&) override; virtual void mousemove_event(GUI::MouseEvent&) override; void draw_at_mouse(const GUI::MouseEvent&); - RefPtr m_font; + RefPtr m_font; u8 m_glyph { 0 }; int m_scale { 10 }; }; diff --git a/Applications/FontEditor/GlyphMapWidget.cpp b/Applications/FontEditor/GlyphMapWidget.cpp index 95ac188514c588..f79b78f4aea87f 100644 --- a/Applications/FontEditor/GlyphMapWidget.cpp +++ b/Applications/FontEditor/GlyphMapWidget.cpp @@ -28,13 +28,13 @@ #include #include -GlyphMapWidget::GlyphMapWidget(Font& mutable_font, GUI::Widget* parent) +GlyphMapWidget::GlyphMapWidget(Gfx::Font& mutable_font, GUI::Widget* parent) : GUI::Frame(parent) , m_font(mutable_font) { set_frame_thickness(2); - set_frame_shape(FrameShape::Container); - set_frame_shadow(FrameShadow::Sunken); + set_frame_shape(Gfx::FrameShape::Container); + set_frame_shadow(Gfx::FrameShadow::Sunken); set_relative_rect({ 0, 0, preferred_width(), preferred_height() }); } diff --git a/Applications/FontEditor/GlyphMapWidget.h b/Applications/FontEditor/GlyphMapWidget.h index 0ad9884e34eb0d..5cee940a9c0d9c 100644 --- a/Applications/FontEditor/GlyphMapWidget.h +++ b/Applications/FontEditor/GlyphMapWidget.h @@ -43,21 +43,21 @@ class GlyphMapWidget final : public GUI::Frame { int preferred_width() const; int preferred_height() const; - Font& font() { return *m_font; } - const Font& font() const { return *m_font; } + Gfx::Font& font() { return *m_font; } + const Gfx::Font& font() const { return *m_font; } void update_glyph(u8); Function on_glyph_selected; private: - GlyphMapWidget(Font&, GUI::Widget* parent); + GlyphMapWidget(Gfx::Font&, GUI::Widget* parent); virtual void paint_event(GUI::PaintEvent&) override; virtual void mousedown_event(GUI::MouseEvent&) override; Rect get_outer_rect(u8 glyph) const; - RefPtr m_font; + RefPtr m_font; int m_rows { 8 }; int m_horizontal_spacing { 2 }; int m_vertical_spacing { 2 }; diff --git a/Applications/FontEditor/main.cpp b/Applications/FontEditor/main.cpp index 94819dd3cbb9bf..a6fb0974554b90 100644 --- a/Applications/FontEditor/main.cpp +++ b/Applications/FontEditor/main.cpp @@ -47,12 +47,12 @@ int main(int argc, char** argv) return 1; } - RefPtr edited_font; + RefPtr edited_font; String path; if (argc == 2) { path = argv[1]; - edited_font = Font::load_from_file(path); + edited_font = Gfx::Font::load_from_file(path); if (!edited_font) { fprintf(stderr, "Couldn't load font: %s\n", path.characters()); return 1; @@ -62,7 +62,7 @@ int main(int argc, char** argv) if (edited_font) edited_font = edited_font->clone(); else - edited_font = Font::default_font().clone(); + edited_font = Gfx::Font::default_font().clone(); auto window = GUI::Window::construct(); window->set_title("Font Editor"); @@ -71,7 +71,7 @@ int main(int argc, char** argv) auto font_editor = FontEditorWidget::construct(path, move(edited_font)); window->set_main_widget(font_editor); window->show(); - window->set_icon(load_png("/res/icons/16x16/app-font-editor.png")); + window->set_icon(Gfx::load_png("/res/icons/16x16/app-font-editor.png")); auto menubar = make(); @@ -84,7 +84,7 @@ int main(int argc, char** argv) auto help_menu = GUI::Menu::construct("Help"); help_menu->add_action(GUI::Action::create("About", [&](const GUI::Action&) { - GUI::AboutDialog::show("Font Editor", load_png("/res/icons/FontEditor.png"), window); + GUI::AboutDialog::show("Font Editor", Gfx::load_png("/res/icons/FontEditor.png"), window); })); menubar->add_menu(move(help_menu)); diff --git a/Applications/Help/ManualModel.cpp b/Applications/Help/ManualModel.cpp index 12fbd317260b74..302228106c32f7 100644 --- a/Applications/Help/ManualModel.cpp +++ b/Applications/Help/ManualModel.cpp @@ -44,8 +44,8 @@ static ManualSectionNode s_sections[] = { ManualModel::ManualModel() { // FIXME: need some help from the icon fairy ^) - m_section_icon.set_bitmap_for_size(16, load_png("/res/icons/16x16/book.png")); - m_page_icon.set_bitmap_for_size(16, load_png("/res/icons/16x16/filetype-unknown.png")); + m_section_icon.set_bitmap_for_size(16, Gfx::load_png("/res/icons/16x16/book.png")); + m_page_icon.set_bitmap_for_size(16, Gfx::load_png("/res/icons/16x16/filetype-unknown.png")); } String ManualModel::page_path(const GUI::ModelIndex& index) const diff --git a/Applications/Help/main.cpp b/Applications/Help/main.cpp index 69e50ed37e4cb5..e22f8f03e919b0 100644 --- a/Applications/Help/main.cpp +++ b/Applications/Help/main.cpp @@ -180,7 +180,7 @@ int main(int argc, char* argv[]) auto app_menu = GUI::Menu::construct("Help"); app_menu->add_action(GUI::Action::create("About", [&](const GUI::Action&) { - GUI::AboutDialog::show("Help", load_png("/res/icons/16x16/book.png"), window); + GUI::AboutDialog::show("Help", Gfx::load_png("/res/icons/16x16/book.png"), window); })); app_menu->add_separator(); app_menu->add_action(GUI::CommonActions::make_quit_action([](auto&) { @@ -199,7 +199,7 @@ int main(int argc, char* argv[]) window->set_focused_widget(tree_view); window->show(); - window->set_icon(load_png("/res/icons/16x16/book.png")); + window->set_icon(Gfx::load_png("/res/icons/16x16/book.png")); return app.exec(); } diff --git a/Applications/HexEditor/HexEditor.cpp b/Applications/HexEditor/HexEditor.cpp index a965009484d4c3..310187e9fd3160 100644 --- a/Applications/HexEditor/HexEditor.cpp +++ b/Applications/HexEditor/HexEditor.cpp @@ -44,8 +44,8 @@ HexEditor::HexEditor(GUI::Widget* parent) : ScrollableWidget(parent) { - set_frame_shape(FrameShape::Container); - set_frame_shadow(FrameShadow::Sunken); + set_frame_shape(Gfx::FrameShape::Container); + set_frame_shadow(Gfx::FrameShadow::Sunken); set_frame_thickness(2); set_scrollbars_enabled(true); set_font(GFontDatabase::the().get_by_name("Csilla Thin")); @@ -544,7 +544,7 @@ void HexEditor::paint_event(GUI::PaintEvent& event) } auto line = String::format("%02X", m_buffer[byte_position]); - painter.draw_text(hex_display_rect, line, TextAlignment::TopLeft, text_color); + painter.draw_text(hex_display_rect, line, Gfx::TextAlignment::TopLeft, text_color); Rect text_display_rect { frame_thickness() + offset_margin_width() + (bytes_per_row() * (character_width() * 3)) + (j * character_width()) + 20, @@ -559,7 +559,7 @@ void HexEditor::paint_event(GUI::PaintEvent& event) painter.fill_rect(text_display_rect, Color::from_rgb(0xCCCCCC)); } - painter.draw_text(text_display_rect, String::format("%c", isprint(m_buffer[byte_position]) ? m_buffer[byte_position] : '.'), TextAlignment::TopLeft, text_color); + painter.draw_text(text_display_rect, String::format("%c", isprint(m_buffer[byte_position]) ? m_buffer[byte_position] : '.'), Gfx::TextAlignment::TopLeft, text_color); } } } diff --git a/Applications/HexEditor/HexEditorWidget.cpp b/Applications/HexEditor/HexEditorWidget.cpp index eb548ba7b4774f..e765e3aac18522 100644 --- a/Applications/HexEditor/HexEditorWidget.cpp +++ b/Applications/HexEditor/HexEditorWidget.cpp @@ -68,7 +68,7 @@ HexEditorWidget::HexEditorWidget() m_statusbar = GUI::StatusBar::construct(5, this); - m_new_action = GUI::Action::create("New", { Mod_Ctrl, Key_N }, GraphicsBitmap::load_from_file("/res/icons/16x16/new.png"), [this](const GUI::Action&) { + m_new_action = GUI::Action::create("New", { Mod_Ctrl, Key_N }, Gfx::Bitmap::load_from_file("/res/icons/16x16/new.png"), [this](const GUI::Action&) { if (m_document_dirty) { auto save_document_first_box = GUI::MessageBox::construct("Save Document First?", "Warning", GUI::MessageBox::Type::Warning, GUI::MessageBox::InputType::OKCancel, window()); auto save_document_first_result = save_document_first_box->exec(); @@ -102,7 +102,7 @@ HexEditorWidget::HexEditorWidget() open_file(open_path.value()); }); - m_save_action = GUI::Action::create("Save", { Mod_Ctrl, Key_S }, GraphicsBitmap::load_from_file("/res/icons/16x16/save.png"), [&](const GUI::Action&) { + m_save_action = GUI::Action::create("Save", { Mod_Ctrl, Key_S }, Gfx::Bitmap::load_from_file("/res/icons/16x16/save.png"), [&](const GUI::Action&) { if (!m_path.is_empty()) { if (!m_editor->write_to_file(m_path)) { GUI::MessageBox::show("Unable to save file.\n", "Error", GUI::MessageBox::Type::Error, GUI::MessageBox::InputType::OK, window()); @@ -116,7 +116,7 @@ HexEditorWidget::HexEditorWidget() m_save_as_action->activate(); }); - m_save_as_action = GUI::Action::create("Save as...", { Mod_Ctrl | Mod_Shift, Key_S }, GraphicsBitmap::load_from_file("/res/icons/16x16/save.png"), [this](const GUI::Action&) { + m_save_as_action = GUI::Action::create("Save as...", { Mod_Ctrl | Mod_Shift, Key_S }, Gfx::Bitmap::load_from_file("/res/icons/16x16/save.png"), [this](const GUI::Action&) { Optional save_path = GUI::FilePicker::get_save_filepath(m_name.is_null() ? "Untitled" : m_name, m_extension.is_null() ? "bin" : m_extension); if (!save_path.has_value()) return; @@ -153,7 +153,7 @@ HexEditorWidget::HexEditorWidget() })); } - m_goto_decimal_offset_action = GUI::Action::create("Go To Offset (Decimal)...", { Mod_Ctrl | Mod_Shift, Key_G }, GraphicsBitmap::load_from_file("/res/icons/16x16/go-forward.png"), [this](const GUI::Action&) { + m_goto_decimal_offset_action = GUI::Action::create("Go To Offset (Decimal)...", { Mod_Ctrl | Mod_Shift, Key_G }, Gfx::Bitmap::load_from_file("/res/icons/16x16/go-forward.png"), [this](const GUI::Action&) { auto input_box = GUI::InputBox::construct("Enter Decimal offset:", "Go To", this); if (input_box->exec() == GUI::InputBox::ExecOK && !input_box->text_value().is_empty()) { auto valid = false; @@ -164,7 +164,7 @@ HexEditorWidget::HexEditorWidget() } }); - m_goto_hex_offset_action = GUI::Action::create("Go To Offset (Hex)...", { Mod_Ctrl, Key_G }, GraphicsBitmap::load_from_file("/res/icons/16x16/go-forward.png"), [this](const GUI::Action&) { + m_goto_hex_offset_action = GUI::Action::create("Go To Offset (Hex)...", { Mod_Ctrl, Key_G }, Gfx::Bitmap::load_from_file("/res/icons/16x16/go-forward.png"), [this](const GUI::Action&) { auto input_box = GUI::InputBox::construct("Enter Hex offset:", "Go To", this); if (input_box->exec() == GUI::InputBox::ExecOK && !input_box->text_value().is_empty()) { auto new_offset = strtol(input_box->text_value().characters(), nullptr, 16); @@ -202,7 +202,7 @@ HexEditorWidget::HexEditorWidget() auto help_menu = GUI::Menu::construct("Help"); help_menu->add_action(GUI::Action::create("About", [&](const GUI::Action&) { - GUI::AboutDialog::show("Hex Editor", load_png("/res/icons/32x32/app-hexeditor.png"), window()); + GUI::AboutDialog::show("Hex Editor", Gfx::load_png("/res/icons/32x32/app-hexeditor.png"), window()); })); menubar->add_menu(move(help_menu)); diff --git a/Applications/HexEditor/main.cpp b/Applications/HexEditor/main.cpp index 38cf4aeb460570..f877cdac3d5898 100644 --- a/Applications/HexEditor/main.cpp +++ b/Applications/HexEditor/main.cpp @@ -56,7 +56,7 @@ int main(int argc, char** argv) }; window->show(); - window->set_icon(load_png("/res/icons/16x16/app-hexeditor.png")); + window->set_icon(Gfx::load_png("/res/icons/16x16/app-hexeditor.png")); if (argc >= 2) hex_editor_widget->open_file(argv[1]); diff --git a/Applications/IRCClient/IRCAppWindow.cpp b/Applications/IRCClient/IRCAppWindow.cpp index 5e2bb26c468d91..ef4e8445ad574a 100644 --- a/Applications/IRCClient/IRCAppWindow.cpp +++ b/Applications/IRCClient/IRCAppWindow.cpp @@ -55,7 +55,7 @@ IRCAppWindow::IRCAppWindow() ASSERT(!s_the); s_the = this; - set_icon(load_png("/res/icons/16x16/app-irc-client.png")); + set_icon(Gfx::load_png("/res/icons/16x16/app-irc-client.png")); update_title(); set_rect(200, 200, 600, 400); @@ -108,13 +108,13 @@ void IRCAppWindow::setup_client() void IRCAppWindow::setup_actions() { - m_join_action = GUI::Action::create("Join channel", { Mod_Ctrl, Key_J }, GraphicsBitmap::load_from_file("/res/icons/16x16/irc-join.png"), [&](auto&) { + m_join_action = GUI::Action::create("Join channel", { Mod_Ctrl, Key_J }, Gfx::Bitmap::load_from_file("/res/icons/16x16/irc-join.png"), [&](auto&) { auto input_box = GUI::InputBox::construct("Enter channel name:", "Join channel", this); if (input_box->exec() == GUI::InputBox::ExecOK && !input_box->text_value().is_empty()) m_client.handle_join_action(input_box->text_value()); }); - m_part_action = GUI::Action::create("Part from channel", { Mod_Ctrl, Key_P }, GraphicsBitmap::load_from_file("/res/icons/16x16/irc-part.png"), [this](auto&) { + m_part_action = GUI::Action::create("Part from channel", { Mod_Ctrl, Key_P }, Gfx::Bitmap::load_from_file("/res/icons/16x16/irc-part.png"), [this](auto&) { auto* window = m_client.current_window(); if (!window || window->type() != IRCWindow::Type::Channel) { // FIXME: Perhaps this action should have been disabled instead of allowing us to activate it. @@ -123,23 +123,23 @@ void IRCAppWindow::setup_actions() m_client.handle_part_action(window->channel().name()); }); - m_whois_action = GUI::Action::create("Whois user", GraphicsBitmap::load_from_file("/res/icons/16x16/irc-whois.png"), [&](auto&) { + m_whois_action = GUI::Action::create("Whois user", Gfx::Bitmap::load_from_file("/res/icons/16x16/irc-whois.png"), [&](auto&) { auto input_box = GUI::InputBox::construct("Enter nickname:", "IRC WHOIS lookup", this); if (input_box->exec() == GUI::InputBox::ExecOK && !input_box->text_value().is_empty()) m_client.handle_whois_action(input_box->text_value()); }); - m_open_query_action = GUI::Action::create("Open query", { Mod_Ctrl, Key_O }, GraphicsBitmap::load_from_file("/res/icons/16x16/irc-open-query.png"), [&](auto&) { + m_open_query_action = GUI::Action::create("Open query", { Mod_Ctrl, Key_O }, Gfx::Bitmap::load_from_file("/res/icons/16x16/irc-open-query.png"), [&](auto&) { auto input_box = GUI::InputBox::construct("Enter nickname:", "Open IRC query with...", this); if (input_box->exec() == GUI::InputBox::ExecOK && !input_box->text_value().is_empty()) m_client.handle_open_query_action(input_box->text_value()); }); - m_close_query_action = GUI::Action::create("Close query", { Mod_Ctrl, Key_D }, GraphicsBitmap::load_from_file("/res/icons/16x16/irc-close-query.png"), [](auto&) { + m_close_query_action = GUI::Action::create("Close query", { Mod_Ctrl, Key_D }, Gfx::Bitmap::load_from_file("/res/icons/16x16/irc-close-query.png"), [](auto&) { printf("FIXME: Implement close-query action\n"); }); - m_change_nick_action = GUI::Action::create("Change nickname", GraphicsBitmap::load_from_file("/res/icons/16x16/irc-nick.png"), [this](auto&) { + m_change_nick_action = GUI::Action::create("Change nickname", Gfx::Bitmap::load_from_file("/res/icons/16x16/irc-nick.png"), [this](auto&) { auto input_box = GUI::InputBox::construct("Enter nickname:", "Change nickname", this); if (input_box->exec() == GUI::InputBox::ExecOK && !input_box->text_value().is_empty()) m_client.handle_change_nick_action(input_box->text_value()); @@ -170,7 +170,7 @@ void IRCAppWindow::setup_menus() auto help_menu = GUI::Menu::construct("Help"); help_menu->add_action(GUI::Action::create("About", [this](const GUI::Action&) { - GUI::AboutDialog::show("IRC Client", load_png("/res/icons/32x32/app-irc-client.png"), this); + GUI::AboutDialog::show("IRC Client", Gfx::load_png("/res/icons/32x32/app-irc-client.png"), this); })); menubar->add_menu(move(help_menu)); diff --git a/Applications/IRCClient/IRCChannelMemberListModel.cpp b/Applications/IRCClient/IRCChannelMemberListModel.cpp index 20b5094d23a9f8..aca79040c85618 100644 --- a/Applications/IRCClient/IRCChannelMemberListModel.cpp +++ b/Applications/IRCClient/IRCChannelMemberListModel.cpp @@ -61,7 +61,7 @@ GUI::Model::ColumnMetadata IRCChannelMemberListModel::column_metadata(int column { switch (column) { case Column::Name: - return { 70, TextAlignment::CenterLeft }; + return { 70, Gfx::TextAlignment::CenterLeft }; } ASSERT_NOT_REACHED(); } diff --git a/Applications/IRCClient/IRCWindowListModel.cpp b/Applications/IRCClient/IRCWindowListModel.cpp index 152ddfbb463abb..6b504502030b69 100644 --- a/Applications/IRCClient/IRCWindowListModel.cpp +++ b/Applications/IRCClient/IRCWindowListModel.cpp @@ -63,7 +63,7 @@ GUI::Model::ColumnMetadata IRCWindowListModel::column_metadata(int column) const { switch (column) { case Column::Name: - return { 70, TextAlignment::CenterLeft }; + return { 70, Gfx::TextAlignment::CenterLeft }; } ASSERT_NOT_REACHED(); } diff --git a/Applications/PaintBrush/BucketTool.cpp b/Applications/PaintBrush/BucketTool.cpp index 19668b5415d1f9..135bbd58c1835b 100644 --- a/Applications/PaintBrush/BucketTool.cpp +++ b/Applications/PaintBrush/BucketTool.cpp @@ -40,7 +40,7 @@ BucketTool::~BucketTool() { } -static void flood_fill(GraphicsBitmap& bitmap, const Point& start_position, Color target_color, Color fill_color) +static void flood_fill(Gfx::Bitmap& bitmap, const Gfx::Point& start_position, Color target_color, Color fill_color) { ASSERT(bitmap.bpp() == 32); @@ -48,13 +48,13 @@ static void flood_fill(GraphicsBitmap& bitmap, const Point& start_position, Colo return; Queue queue; - queue.enqueue(Point(start_position)); + queue.enqueue(start_position); while (!queue.is_empty()) { auto position = queue.dequeue(); - if (bitmap.get_pixel(position.x(), position.y()) != target_color) + if (bitmap.get_pixel(position.x(), position.y()) != target_color) continue; - bitmap.set_pixel(position.x(), position.y(), fill_color); + bitmap.set_pixel(position.x(), position.y(), fill_color); if (position.x() != 0) queue.enqueue(position.translated(-1, 0)); diff --git a/Applications/PaintBrush/EllipseTool.h b/Applications/PaintBrush/EllipseTool.h index 6c59b1637b9e46..a55b8eb911c2ce 100644 --- a/Applications/PaintBrush/EllipseTool.h +++ b/Applications/PaintBrush/EllipseTool.h @@ -57,8 +57,8 @@ class EllipseTool final : public Tool { void draw_using(GUI::Painter& painter); GUI::MouseButton m_drawing_button { GUI::MouseButton::None }; - Point m_ellipse_start_position; - Point m_ellipse_end_position; + Gfx::Point m_ellipse_start_position; + Gfx::Point m_ellipse_end_position; RefPtr m_context_menu; int m_thickness { 1 }; GUI::ActionGroup m_thickness_actions; diff --git a/Applications/PaintBrush/EraseTool.cpp b/Applications/PaintBrush/EraseTool.cpp index 42525084324df3..b57d0132329ff1 100644 --- a/Applications/PaintBrush/EraseTool.cpp +++ b/Applications/PaintBrush/EraseTool.cpp @@ -38,7 +38,7 @@ EraseTool::~EraseTool() { } -Rect EraseTool::build_rect(const Point& pos, const Rect& widget_rect) +Rect EraseTool::build_rect(const Gfx::Point& pos, const Gfx::Rect& widget_rect) { const int base_eraser_size = 10; const int eraser_size = (base_eraser_size * m_thickness); diff --git a/Applications/PaintBrush/EraseTool.h b/Applications/PaintBrush/EraseTool.h index 576a1f5b46e31b..89ebbbc047f872 100644 --- a/Applications/PaintBrush/EraseTool.h +++ b/Applications/PaintBrush/EraseTool.h @@ -46,7 +46,7 @@ class EraseTool final : public Tool { private: Color get_color() const; virtual const char* class_name() const override { return "EraseTool"; } - Rect build_rect(const Point& pos, const Rect& widget_rect); + Rect build_rect(const Gfx::Point& pos, const Gfx::Rect& widget_rect); RefPtr m_context_menu; bool m_use_secondary_color { true }; diff --git a/Applications/PaintBrush/LineTool.cpp b/Applications/PaintBrush/LineTool.cpp index e3ffaa0bb63a13..9f1bfef49b18f5 100644 --- a/Applications/PaintBrush/LineTool.cpp +++ b/Applications/PaintBrush/LineTool.cpp @@ -31,7 +31,7 @@ #include #include -Point constrain_line_angle(const Point& start_pos, const Point& end_pos, float angle_increment) +Point constrain_line_angle(const Gfx::Point& start_pos, const Gfx::Point& end_pos, float angle_increment) { float current_angle = atan2(end_pos.y() - start_pos.y(), end_pos.x() - start_pos.x()) + M_PI * 2.; diff --git a/Applications/PaintBrush/LineTool.h b/Applications/PaintBrush/LineTool.h index 40657ac5b0a468..42f244b29ecba5 100644 --- a/Applications/PaintBrush/LineTool.h +++ b/Applications/PaintBrush/LineTool.h @@ -51,8 +51,8 @@ class LineTool final : public Tool { virtual const char* class_name() const override { return "LineTool"; } GUI::MouseButton m_drawing_button { GUI::MouseButton::None }; - Point m_line_start_position; - Point m_line_end_position; + Gfx::Point m_line_start_position; + Gfx::Point m_line_end_position; RefPtr m_context_menu; GUI::ActionGroup m_thickness_actions; int m_thickness { 1 }; diff --git a/Applications/PaintBrush/PaintableWidget.cpp b/Applications/PaintBrush/PaintableWidget.cpp index 42ac963529c20b..a423b0e9d0af65 100644 --- a/Applications/PaintBrush/PaintableWidget.cpp +++ b/Applications/PaintBrush/PaintableWidget.cpp @@ -47,7 +47,7 @@ PaintableWidget::PaintableWidget(GUI::Widget* parent) pal.set_color(ColorRole::Window, Color::MidGray); set_palette(pal); set_background_color(Color::MidGray); - m_bitmap = GraphicsBitmap::create(GraphicsBitmap::Format::RGB32, { 600, 400 }); + m_bitmap = Gfx::Bitmap::create(Gfx::Bitmap::Format::RGB32, { 600, 400 }); m_bitmap->fill(Color::White); } @@ -158,7 +158,7 @@ void PaintableWidget::set_secondary_color(Color color) on_secondary_color_change(color); } -void PaintableWidget::set_bitmap(const GraphicsBitmap& bitmap) +void PaintableWidget::set_bitmap(const Gfx::Bitmap& bitmap) { m_bitmap = bitmap; update(); diff --git a/Applications/PaintBrush/PaintableWidget.h b/Applications/PaintBrush/PaintableWidget.h index 1883a4fa571c3d..79300c66daebd9 100644 --- a/Applications/PaintBrush/PaintableWidget.h +++ b/Applications/PaintBrush/PaintableWidget.h @@ -49,10 +49,10 @@ class PaintableWidget final : public GUI::Widget { Color color_for(const GUI::MouseEvent&) const; Color color_for(GUI::MouseButton) const; - void set_bitmap(const GraphicsBitmap&); + void set_bitmap(const Gfx::Bitmap&); - GraphicsBitmap& bitmap() { return *m_bitmap; } - const GraphicsBitmap& bitmap() const { return *m_bitmap; } + Gfx::Bitmap& bitmap() { return *m_bitmap; } + const Gfx::Bitmap& bitmap() const { return *m_bitmap; } Function on_primary_color_change; Function on_secondary_color_change; @@ -67,7 +67,7 @@ class PaintableWidget final : public GUI::Widget { virtual void keydown_event(GUI::KeyEvent&) override; virtual void keyup_event(GUI::KeyEvent&) override; - RefPtr m_bitmap; + RefPtr m_bitmap; Color m_primary_color { Color::Black }; Color m_secondary_color { Color::White }; diff --git a/Applications/PaintBrush/PaletteWidget.cpp b/Applications/PaintBrush/PaletteWidget.cpp index 0760d3074e4400..9a309699addb96 100644 --- a/Applications/PaintBrush/PaletteWidget.cpp +++ b/Applications/PaintBrush/PaletteWidget.cpp @@ -38,8 +38,8 @@ class ColorWidget : public GUI::Frame { , m_color(color) { set_frame_thickness(2); - set_frame_shadow(FrameShadow::Sunken); - set_frame_shape(FrameShape::Container); + set_frame_shadow(Gfx::FrameShadow::Sunken); + set_frame_shape(Gfx::FrameShape::Container); } virtual ~ColorWidget() override @@ -75,8 +75,8 @@ PaletteWidget::PaletteWidget(PaintableWidget& paintable_widget, GUI::Widget* par : GUI::Frame(parent) , m_paintable_widget(paintable_widget) { - set_frame_shape(FrameShape::Panel); - set_frame_shadow(FrameShadow::Raised); + set_frame_shape(Gfx::FrameShape::Panel); + set_frame_shadow(Gfx::FrameShadow::Raised); set_frame_thickness(0); set_fill_with_background_color(true); @@ -85,16 +85,16 @@ PaletteWidget::PaletteWidget(PaintableWidget& paintable_widget, GUI::Widget* par m_secondary_color_widget = GUI::Frame::construct(this); m_secondary_color_widget->set_frame_thickness(2); - m_secondary_color_widget->set_frame_shape(FrameShape::Container); - m_secondary_color_widget->set_frame_shadow(FrameShadow::Sunken); + m_secondary_color_widget->set_frame_shape(Gfx::FrameShape::Container); + m_secondary_color_widget->set_frame_shadow(Gfx::FrameShadow::Sunken); m_secondary_color_widget->set_relative_rect({ 2, 2, 60, 31 }); m_secondary_color_widget->set_fill_with_background_color(true); set_secondary_color(paintable_widget.secondary_color()); m_primary_color_widget = GUI::Frame::construct(this); m_primary_color_widget->set_frame_thickness(2); - m_primary_color_widget->set_frame_shape(FrameShape::Container); - m_primary_color_widget->set_frame_shadow(FrameShadow::Sunken); + m_primary_color_widget->set_frame_shape(Gfx::FrameShape::Container); + m_primary_color_widget->set_frame_shadow(Gfx::FrameShadow::Sunken); Rect rect { 0, 0, 38, 15 }; rect.center_within(m_secondary_color_widget->relative_rect()); m_primary_color_widget->set_relative_rect(rect); diff --git a/Applications/PaintBrush/PenTool.h b/Applications/PaintBrush/PenTool.h index c98f58ba0af6c0..52c1f17257ad7b 100644 --- a/Applications/PaintBrush/PenTool.h +++ b/Applications/PaintBrush/PenTool.h @@ -47,7 +47,7 @@ class PenTool final : public Tool { private: virtual const char* class_name() const override { return "PenTool"; } - Point m_last_drawing_event_position { -1, -1 }; + Gfx::Point m_last_drawing_event_position { -1, -1 }; RefPtr m_context_menu; int m_thickness { 1 }; GUI::ActionGroup m_thickness_actions; diff --git a/Applications/PaintBrush/RectangleTool.h b/Applications/PaintBrush/RectangleTool.h index 2e507acd0dfc35..171c3762417d2c 100644 --- a/Applications/PaintBrush/RectangleTool.h +++ b/Applications/PaintBrush/RectangleTool.h @@ -57,8 +57,8 @@ class RectangleTool final : public Tool { void draw_using(GUI::Painter& painter); GUI::MouseButton m_drawing_button { GUI::MouseButton::None }; - Point m_rectangle_start_position; - Point m_rectangle_end_position; + Gfx::Point m_rectangle_start_position; + Gfx::Point m_rectangle_end_position; RefPtr m_context_menu; Mode m_mode { Mode::Outline }; }; diff --git a/Applications/PaintBrush/SprayTool.cpp b/Applications/PaintBrush/SprayTool.cpp index cb07adf262632e..69083cd1fad7b8 100644 --- a/Applications/PaintBrush/SprayTool.cpp +++ b/Applications/PaintBrush/SprayTool.cpp @@ -70,7 +70,7 @@ void SprayTool::paint_it() continue; if (ypos < 0 || ypos >= bitmap.height()) continue; - bitmap.set_pixel(xpos, ypos, m_color); + bitmap.set_pixel(xpos, ypos, m_color); } } diff --git a/Applications/PaintBrush/SprayTool.h b/Applications/PaintBrush/SprayTool.h index 65bbe7c7388ff5..ed517fa777ce23 100644 --- a/Applications/PaintBrush/SprayTool.h +++ b/Applications/PaintBrush/SprayTool.h @@ -49,7 +49,7 @@ class SprayTool final : public Tool { virtual const char* class_name() const override { return "SprayTool"; } void paint_it(); RefPtr m_timer; - Point m_last_pos; + Gfx::Point m_last_pos; Color m_color; RefPtr m_context_menu; GUI::ActionGroup m_thickness_actions; diff --git a/Applications/PaintBrush/ToolboxWidget.cpp b/Applications/PaintBrush/ToolboxWidget.cpp index 3f0708cc68cffd..cf13fa02968e26 100644 --- a/Applications/PaintBrush/ToolboxWidget.cpp +++ b/Applications/PaintBrush/ToolboxWidget.cpp @@ -67,8 +67,8 @@ ToolboxWidget::ToolboxWidget(GUI::Widget* parent) set_fill_with_background_color(true); set_frame_thickness(1); - set_frame_shape(FrameShape::Panel); - set_frame_shadow(FrameShadow::Raised); + set_frame_shape(Gfx::FrameShape::Panel); + set_frame_shadow(Gfx::FrameShadow::Raised); set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); set_preferred_size(48, 0); @@ -83,7 +83,7 @@ ToolboxWidget::ToolboxWidget(GUI::Widget* parent) button->set_checkable(true); button->set_exclusive(true); - button->set_icon(load_png(String::format("/res/icons/paintbrush/%s.png", String(icon_name).characters()))); + button->set_icon(Gfx::load_png(String::format("/res/icons/paintbrush/%s.png", String(icon_name).characters()))); button->on_checked = [button = button.ptr()](auto checked) { if (checked) diff --git a/Applications/PaintBrush/main.cpp b/Applications/PaintBrush/main.cpp index 9ce2ffc7bceed3..bf8401a5dfcd5f 100644 --- a/Applications/PaintBrush/main.cpp +++ b/Applications/PaintBrush/main.cpp @@ -56,7 +56,7 @@ int main(int argc, char** argv) auto window = GUI::Window::construct(); window->set_title("PaintBrush"); window->set_rect(100, 100, 640, 480); - window->set_icon(load_png("/res/icons/16x16/app-paintbrush.png")); + window->set_icon(Gfx::load_png("/res/icons/16x16/app-paintbrush.png")); auto horizontal_container = GUI::Widget::construct(); window->set_main_widget(horizontal_container); @@ -84,7 +84,7 @@ int main(int argc, char** argv) if (!open_path.has_value()) return; - auto bitmap = load_png(open_path.value()); + auto bitmap = Gfx::load_png(open_path.value()); if (!bitmap) { GUI::MessageBox::show(String::format("Failed to load '%s'", open_path.value().characters()), "Open failed", GUI::MessageBox::Type::Error, GUI::MessageBox::InputType::OK, window); return; @@ -104,7 +104,7 @@ int main(int argc, char** argv) auto help_menu = GUI::Menu::construct("Help"); help_menu->add_action(GUI::Action::create("About", [&](auto&) { - GUI::AboutDialog::show("PaintBrush", load_png("/res/icons/32x32/app-paintbrush.png"), window); + GUI::AboutDialog::show("PaintBrush", Gfx::load_png("/res/icons/32x32/app-paintbrush.png"), window); })); menubar->add_menu(move(help_menu)); diff --git a/Applications/Piano/KeysWidget.cpp b/Applications/Piano/KeysWidget.cpp index 77608e31bcedf0..4f7963de3f53d7 100644 --- a/Applications/Piano/KeysWidget.cpp +++ b/Applications/Piano/KeysWidget.cpp @@ -34,8 +34,8 @@ KeysWidget::KeysWidget(GUI::Widget* parent, AudioEngine& audio_engine) , m_audio_engine(audio_engine) { set_frame_thickness(2); - set_frame_shadow(FrameShadow::Sunken); - set_frame_shape(FrameShape::Container); + set_frame_shadow(Gfx::FrameShadow::Sunken); + set_frame_shape(Gfx::FrameShape::Container); set_fill_with_background_color(true); } @@ -188,7 +188,7 @@ void KeysWidget::paint_event(GUI::PaintEvent& event) painter.draw_rect(rect, Color::Black); if (i < white_key_labels_count) { rect.set_height(rect.height() * 1.5); - painter.draw_text(rect, StringView(&white_key_labels[i], 1), TextAlignment::Center, Color::Black); + painter.draw_text(rect, StringView(&white_key_labels[i], 1), Gfx::TextAlignment::Center, Color::Black); } note += white_key_note_accumulator[i % white_keys_per_octave]; @@ -210,7 +210,7 @@ void KeysWidget::paint_event(GUI::PaintEvent& event) painter.draw_rect(rect, Color::Black); if (i < black_key_labels_count) { rect.set_height(rect.height() * 1.5); - painter.draw_text(rect, StringView(&black_key_labels[i], 1), TextAlignment::Center, Color::White); + painter.draw_text(rect, StringView(&black_key_labels[i], 1), Gfx::TextAlignment::Center, Color::White); } note += black_key_note_accumulator[i % black_keys_per_octave]; @@ -249,11 +249,12 @@ static inline int note_from_white_keys(int white_keys) return note; } -int KeysWidget::note_for_event_position(Point point) const +int KeysWidget::note_for_event_position(const Gfx::Point& a_point) const { - if (!frame_inner_rect().contains(point)) + if (!frame_inner_rect().contains(a_point)) return -1; + auto point = a_point; point.move_by(-frame_thickness(), -frame_thickness()); int white_keys = point.x() / white_key_width; diff --git a/Applications/Piano/KeysWidget.h b/Applications/Piano/KeysWidget.h index a051457b8d9084..0c44487356f8dc 100644 --- a/Applications/Piano/KeysWidget.h +++ b/Applications/Piano/KeysWidget.h @@ -50,7 +50,7 @@ class KeysWidget final : public GUI::Frame { virtual void mouseup_event(GUI::MouseEvent&) override; virtual void mousemove_event(GUI::MouseEvent&) override; - int note_for_event_position(Point) const; + int note_for_event_position(const Gfx::Point&) const; AudioEngine& m_audio_engine; diff --git a/Applications/Piano/KnobsWidget.cpp b/Applications/Piano/KnobsWidget.cpp index f35f7869a3234b..a5cf1ac20436c7 100644 --- a/Applications/Piano/KnobsWidget.cpp +++ b/Applications/Piano/KnobsWidget.cpp @@ -38,8 +38,8 @@ KnobsWidget::KnobsWidget(GUI::Widget* parent, AudioEngine& audio_engine, MainWid , m_main_widget(main_widget) { set_frame_thickness(2); - set_frame_shadow(FrameShadow::Sunken); - set_frame_shape(FrameShape::Container); + set_frame_shadow(Gfx::FrameShadow::Sunken); + set_frame_shape(Gfx::FrameShape::Container); set_layout(make()); set_fill_with_background_color(true); diff --git a/Applications/Piano/RollWidget.cpp b/Applications/Piano/RollWidget.cpp index 325cafe88029f5..e39206788d509a 100644 --- a/Applications/Piano/RollWidget.cpp +++ b/Applications/Piano/RollWidget.cpp @@ -38,8 +38,8 @@ RollWidget::RollWidget(GUI::Widget* parent, AudioEngine& audio_engine) , m_audio_engine(audio_engine) { set_frame_thickness(2); - set_frame_shadow(FrameShadow::Sunken); - set_frame_shape(FrameShape::Container); + set_frame_shadow(Gfx::FrameShadow::Sunken); + set_frame_shape(Gfx::FrameShape::Container); set_should_hide_unnecessary_scrollbars(true); set_content_size({ 0, roll_height }); diff --git a/Applications/Piano/WaveWidget.cpp b/Applications/Piano/WaveWidget.cpp index 5a66c6e08f2485..817c80b02959c0 100644 --- a/Applications/Piano/WaveWidget.cpp +++ b/Applications/Piano/WaveWidget.cpp @@ -35,8 +35,8 @@ WaveWidget::WaveWidget(GUI::Widget* parent, AudioEngine& audio_engine) , m_audio_engine(audio_engine) { set_frame_thickness(2); - set_frame_shadow(FrameShadow::Sunken); - set_frame_shape(FrameShape::Container); + set_frame_shadow(Gfx::FrameShadow::Sunken); + set_frame_shape(Gfx::FrameShape::Container); } WaveWidget::~WaveWidget() diff --git a/Applications/Piano/main.cpp b/Applications/Piano/main.cpp index b0d7d3f8f4bc90..25ae0cc81792ee 100644 --- a/Applications/Piano/main.cpp +++ b/Applications/Piano/main.cpp @@ -51,7 +51,7 @@ int main(int argc, char** argv) window->set_main_widget(main_widget); window->set_title("Piano"); window->set_rect(90, 90, 840, 600); - window->set_icon(load_png("/res/icons/16x16/app-piano.png")); + window->set_icon(Gfx::load_png("/res/icons/16x16/app-piano.png")); window->show(); LibThread::Thread audio_thread([&] { @@ -82,7 +82,7 @@ int main(int argc, char** argv) auto help_menu = GUI::Menu::construct("Help"); help_menu->add_action(GUI::Action::create("About", [&](const GUI::Action&) { - GUI::AboutDialog::show("Piano", load_png("/res/icons/32x32/app-piano.png"), window); + GUI::AboutDialog::show("Piano", Gfx::load_png("/res/icons/32x32/app-piano.png"), window); })); menubar->add_menu(move(help_menu)); diff --git a/Applications/QuickShow/QSWidget.cpp b/Applications/QuickShow/QSWidget.cpp index 957e487f28ddbc..02c539513df025 100644 --- a/Applications/QuickShow/QSWidget.cpp +++ b/Applications/QuickShow/QSWidget.cpp @@ -34,8 +34,8 @@ QSWidget::QSWidget(GUI::Widget* parent) : GUI::Frame(parent) { - set_frame_shape(FrameShape::Container); - set_frame_shadow(FrameShadow::Sunken); + set_frame_shape(Gfx::FrameShape::Container); + set_frame_shadow(Gfx::FrameShadow::Sunken); set_frame_thickness(2); set_fill_with_background_color(true); @@ -46,7 +46,7 @@ QSWidget::~QSWidget() { } -void QSWidget::set_bitmap(NonnullRefPtr bitmap) +void QSWidget::set_bitmap(NonnullRefPtr bitmap) { m_bitmap = move(bitmap); } @@ -139,7 +139,7 @@ void QSWidget::drop_event(GUI::DropEvent& event) return; } URL url(lines[0]); - auto bitmap = GraphicsBitmap::load_from_file(url.path()); + auto bitmap = Gfx::Bitmap::load_from_file(url.path()); if (!bitmap) { GUI::MessageBox::show(String::format("Failed to open %s", url.to_string().characters()), "Cannot open image", GUI::MessageBox::Type::Error, GUI::MessageBox::InputType::OK, window()); return; diff --git a/Applications/QuickShow/QSWidget.h b/Applications/QuickShow/QSWidget.h index 21cd4450df58e8..ba6ca1e90d4035 100644 --- a/Applications/QuickShow/QSWidget.h +++ b/Applications/QuickShow/QSWidget.h @@ -35,8 +35,8 @@ class QSWidget final : public GUI::Frame { public: virtual ~QSWidget() override; - void set_bitmap(NonnullRefPtr); - const GraphicsBitmap* bitmap() const { return m_bitmap.ptr(); } + void set_bitmap(NonnullRefPtr); + const Gfx::Bitmap* bitmap() const { return m_bitmap.ptr(); } void set_path(const String&); const String& path() const { return m_path; } @@ -55,10 +55,10 @@ class QSWidget final : public GUI::Frame { void relayout(); - RefPtr m_bitmap; - Rect m_bitmap_rect; + RefPtr m_bitmap; + Gfx::Rect m_bitmap_rect; int m_scale { 100 }; - Point m_pan_origin; - Point m_pan_bitmap_origin; + Gfx::Point m_pan_origin; + Gfx::Point m_pan_bitmap_origin; String m_path; }; diff --git a/Applications/QuickShow/main.cpp b/Applications/QuickShow/main.cpp index c8f3a515cf3318..9c2873b82f96be 100644 --- a/Applications/QuickShow/main.cpp +++ b/Applications/QuickShow/main.cpp @@ -80,7 +80,7 @@ int main(int argc, char** argv) if (argc > 1) path = argv[1]; - auto bitmap = GraphicsBitmap::load_from_file(path); + auto bitmap = Gfx::Bitmap::load_from_file(path); if (!bitmap) { fprintf(stderr, "Failed to load %s\n", path); return 1; diff --git a/Applications/SoundPlayer/SampleWidget.cpp b/Applications/SoundPlayer/SampleWidget.cpp index 0e9c9d3fa050cc..7b405ce41d580c 100644 --- a/Applications/SoundPlayer/SampleWidget.cpp +++ b/Applications/SoundPlayer/SampleWidget.cpp @@ -32,8 +32,8 @@ SampleWidget::SampleWidget(GUI::Widget* parent) : GUI::Frame(parent) { - set_frame_shape(FrameShape::Container); - set_frame_shadow(FrameShadow::Sunken); + set_frame_shape(Gfx::FrameShape::Container); + set_frame_shadow(Gfx::FrameShadow::Sunken); set_frame_thickness(2); } diff --git a/Applications/SoundPlayer/SoundPlayerWidget.cpp b/Applications/SoundPlayer/SoundPlayerWidget.cpp index db017494fd412d..d3bd9c084ff7c4 100644 --- a/Applications/SoundPlayer/SoundPlayerWidget.cpp +++ b/Applications/SoundPlayer/SoundPlayerWidget.cpp @@ -46,8 +46,8 @@ SoundPlayerWidget::SoundPlayerWidget(GUI::Window& window, NonnullRefPtrset_layout(make()); m_elapsed = GUI::Label::construct(status_widget); - m_elapsed->set_frame_shape(FrameShape::Container); - m_elapsed->set_frame_shadow(FrameShadow::Sunken); + m_elapsed->set_frame_shape(Gfx::FrameShape::Container); + m_elapsed->set_frame_shadow(Gfx::FrameShadow::Sunken); m_elapsed->set_frame_thickness(2); m_elapsed->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); m_elapsed->set_preferred_size(80, 0); @@ -59,8 +59,8 @@ SoundPlayerWidget::SoundPlayerWidget(GUI::Window& window, NonnullRefPtrset_frame_shape(FrameShape::Container); - m_remaining->set_frame_shadow(FrameShadow::Sunken); + m_remaining->set_frame_shape(Gfx::FrameShape::Container); + m_remaining->set_frame_shadow(Gfx::FrameShadow::Sunken); m_remaining->set_frame_thickness(2); m_remaining->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); m_remaining->set_preferred_size(80, 0); @@ -87,14 +87,14 @@ SoundPlayerWidget::SoundPlayerWidget(GUI::Window& window, NonnullRefPtrset_enabled(false); - m_stop->set_icon(GraphicsBitmap::load_from_file("/res/icons/16x16/stop.png")); + m_stop->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/stop.png")); m_stop->on_click = [&](GUI::Button&) { m_manager.stop(); }; m_status = GUI::Label::construct(this); - m_status->set_frame_shape(FrameShape::Box); - m_status->set_frame_shadow(FrameShadow::Raised); + m_status->set_frame_shape(Gfx::FrameShape::Box); + m_status->set_frame_shadow(Gfx::FrameShadow::Raised); m_status->set_frame_thickness(4); - m_status->set_text_alignment(TextAlignment::CenterLeft); + m_status->set_text_alignment(Gfx::TextAlignment::CenterLeft); m_status->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); m_status->set_preferred_size(0, 18); m_status->set_text("No file open!"); diff --git a/Applications/SoundPlayer/SoundPlayerWidget.h b/Applications/SoundPlayer/SoundPlayerWidget.h index 5d7daa97398014..8e6ca228d15ddc 100644 --- a/Applications/SoundPlayer/SoundPlayerWidget.h +++ b/Applications/SoundPlayer/SoundPlayerWidget.h @@ -85,8 +85,8 @@ class SoundPlayerWidget final : public GUI::Widget { RefPtr m_remaining; RefPtr m_slider; RefPtr m_sample_widget; - RefPtr m_play_icon { GraphicsBitmap::load_from_file("/res/icons/16x16/play.png") }; - RefPtr m_pause_icon { GraphicsBitmap::load_from_file("/res/icons/16x16/pause.png") }; + RefPtr m_play_icon { Gfx::Bitmap::load_from_file("/res/icons/16x16/play.png") }; + RefPtr m_pause_icon { Gfx::Bitmap::load_from_file("/res/icons/16x16/pause.png") }; RefPtr m_play; RefPtr m_stop; }; diff --git a/Applications/SoundPlayer/main.cpp b/Applications/SoundPlayer/main.cpp index e308c7a0c76d4a..927727751e381d 100644 --- a/Applications/SoundPlayer/main.cpp +++ b/Applications/SoundPlayer/main.cpp @@ -62,7 +62,7 @@ int main(int argc, char** argv) window->set_title("SoundPlayer"); window->set_resizable(false); window->set_rect(300, 300, 350, 140); - window->set_icon(GraphicsBitmap::load_from_file("/res/icons/16x16/app-sound-player.png")); + window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-sound-player.png")); auto menubar = make(); auto app_menu = GUI::Menu::construct("SoundPlayer"); @@ -94,7 +94,7 @@ int main(int argc, char** argv) auto help_menu = GUI::Menu::construct("Help"); help_menu->add_action(GUI::Action::create("About", [](auto&) { - GUI::AboutDialog::show("SoundPlayer", GraphicsBitmap::load_from_file("/res/icons/32x32/app-sound-player.png")); + GUI::AboutDialog::show("SoundPlayer", Gfx::Bitmap::load_from_file("/res/icons/32x32/app-sound-player.png")); })); menubar->add_menu(move(app_menu)); diff --git a/Applications/SystemMonitor/DevicesModel.cpp b/Applications/SystemMonitor/DevicesModel.cpp index 0d50e1d16a159d..c8f8492cc34370 100644 --- a/Applications/SystemMonitor/DevicesModel.cpp +++ b/Applications/SystemMonitor/DevicesModel.cpp @@ -77,15 +77,15 @@ GUI::Model::ColumnMetadata DevicesModel::column_metadata(int column) const { switch (column) { case Column::Device: - return { 70, TextAlignment::CenterLeft }; + return { 70, Gfx::TextAlignment::CenterLeft }; case Column::Major: - return { 32, TextAlignment::CenterRight }; + return { 32, Gfx::TextAlignment::CenterRight }; case Column::Minor: - return { 32, TextAlignment::CenterRight }; + return { 32, Gfx::TextAlignment::CenterRight }; case Column::ClassName: - return { 120, TextAlignment::CenterLeft }; + return { 120, Gfx::TextAlignment::CenterLeft }; case Column::Type: - return { 120, TextAlignment::CenterLeft }; + return { 120, Gfx::TextAlignment::CenterLeft }; default: ASSERT_NOT_REACHED(); } diff --git a/Applications/SystemMonitor/GraphWidget.cpp b/Applications/SystemMonitor/GraphWidget.cpp index 863fede531a396..05c60def9a06b5 100644 --- a/Applications/SystemMonitor/GraphWidget.cpp +++ b/Applications/SystemMonitor/GraphWidget.cpp @@ -31,8 +31,8 @@ GraphWidget::GraphWidget(GUI::Widget* parent) : GUI::Frame(parent) { set_frame_thickness(2); - set_frame_shape(FrameShape::Container); - set_frame_shadow(FrameShadow::Sunken); + set_frame_shape(Gfx::FrameShape::Container); + set_frame_shadow(Gfx::FrameShadow::Sunken); } GraphWidget::~GraphWidget() @@ -72,7 +72,7 @@ void GraphWidget::paint_event(GUI::PaintEvent& event) Rect text_rect = inner_rect.shrunken(8, 8); text_rect.set_height(font().glyph_height()); auto text = text_formatter(m_values.last(), m_max); - painter.draw_text(text_rect.translated(1, 1), text.characters(), TextAlignment::CenterRight, Color::Black); - painter.draw_text(text_rect, text.characters(), TextAlignment::CenterRight, m_text_color); + painter.draw_text(text_rect.translated(1, 1), text.characters(), Gfx::TextAlignment::CenterRight, Color::Black); + painter.draw_text(text_rect, text.characters(), Gfx::TextAlignment::CenterRight, m_text_color); } } diff --git a/Applications/SystemMonitor/MemoryStatsWidget.cpp b/Applications/SystemMonitor/MemoryStatsWidget.cpp index 1bd39f0c8b3465..3fff1dc7cb9cb2 100644 --- a/Applications/SystemMonitor/MemoryStatsWidget.cpp +++ b/Applications/SystemMonitor/MemoryStatsWidget.cpp @@ -62,10 +62,10 @@ MemoryStatsWidget::MemoryStatsWidget(GraphWidget& graph, GUI::Widget* parent) container->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); container->set_preferred_size(275, 12); auto description_label = GUI::Label::construct(description, container); - description_label->set_font(Font::default_bold_font()); - description_label->set_text_alignment(TextAlignment::CenterLeft); + description_label->set_font(Gfx::Font::default_bold_font()); + description_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); auto label = GUI::Label::construct(container); - label->set_text_alignment(TextAlignment::CenterRight); + label->set_text_alignment(Gfx::TextAlignment::CenterRight); return label; }; diff --git a/Applications/SystemMonitor/NetworkStatisticsWidget.cpp b/Applications/SystemMonitor/NetworkStatisticsWidget.cpp index f14f0713369a43..f6ae6609b1846e 100644 --- a/Applications/SystemMonitor/NetworkStatisticsWidget.cpp +++ b/Applications/SystemMonitor/NetworkStatisticsWidget.cpp @@ -48,14 +48,14 @@ NetworkStatisticsWidget::NetworkStatisticsWidget(GUI::Widget* parent) m_adapter_table_view->set_size_columns_to_fit_content(true); Vector net_adapters_fields; - net_adapters_fields.empend("name", "Name", TextAlignment::CenterLeft); - net_adapters_fields.empend("class_name", "Class", TextAlignment::CenterLeft); - net_adapters_fields.empend("mac_address", "MAC", TextAlignment::CenterLeft); - net_adapters_fields.empend("ipv4_address", "IPv4", TextAlignment::CenterLeft); - net_adapters_fields.empend("packets_in", "Pkt In", TextAlignment::CenterRight); - net_adapters_fields.empend("packets_out", "Pkt Out", TextAlignment::CenterRight); - net_adapters_fields.empend("bytes_in", "Bytes In", TextAlignment::CenterRight); - net_adapters_fields.empend("bytes_out", "Bytes Out", TextAlignment::CenterRight); + net_adapters_fields.empend("name", "Name", Gfx::TextAlignment::CenterLeft); + net_adapters_fields.empend("class_name", "Class", Gfx::TextAlignment::CenterLeft); + net_adapters_fields.empend("mac_address", "MAC", Gfx::TextAlignment::CenterLeft); + net_adapters_fields.empend("ipv4_address", "IPv4", Gfx::TextAlignment::CenterLeft); + net_adapters_fields.empend("packets_in", "Pkt In", Gfx::TextAlignment::CenterRight); + net_adapters_fields.empend("packets_out", "Pkt Out", Gfx::TextAlignment::CenterRight); + net_adapters_fields.empend("bytes_in", "Bytes In", Gfx::TextAlignment::CenterRight); + net_adapters_fields.empend("bytes_out", "Bytes Out", Gfx::TextAlignment::CenterRight); m_adapter_table_view->set_model(GUI::JsonArrayModel::create("/proc/net/adapters", move(net_adapters_fields))); auto sockets_group_box = GUI::GroupBox::construct("Sockets", this); @@ -68,17 +68,17 @@ NetworkStatisticsWidget::NetworkStatisticsWidget(GUI::Widget* parent) m_socket_table_view->set_size_columns_to_fit_content(true); Vector net_tcp_fields; - net_tcp_fields.empend("peer_address", "Peer", TextAlignment::CenterLeft); - net_tcp_fields.empend("peer_port", "Port", TextAlignment::CenterRight); - net_tcp_fields.empend("local_address", "Local", TextAlignment::CenterLeft); - net_tcp_fields.empend("local_port", "Port", TextAlignment::CenterRight); - net_tcp_fields.empend("state", "State", TextAlignment::CenterLeft); - net_tcp_fields.empend("ack_number", "Ack#", TextAlignment::CenterRight); - net_tcp_fields.empend("sequence_number", "Seq#", TextAlignment::CenterRight); - net_tcp_fields.empend("packets_in", "Pkt In", TextAlignment::CenterRight); - net_tcp_fields.empend("packets_out", "Pkt Out", TextAlignment::CenterRight); - net_tcp_fields.empend("bytes_in", "Bytes In", TextAlignment::CenterRight); - net_tcp_fields.empend("bytes_out", "Bytes Out", TextAlignment::CenterRight); + net_tcp_fields.empend("peer_address", "Peer", Gfx::TextAlignment::CenterLeft); + net_tcp_fields.empend("peer_port", "Port", Gfx::TextAlignment::CenterRight); + net_tcp_fields.empend("local_address", "Local", Gfx::TextAlignment::CenterLeft); + net_tcp_fields.empend("local_port", "Port", Gfx::TextAlignment::CenterRight); + net_tcp_fields.empend("state", "State", Gfx::TextAlignment::CenterLeft); + net_tcp_fields.empend("ack_number", "Ack#", Gfx::TextAlignment::CenterRight); + net_tcp_fields.empend("sequence_number", "Seq#", Gfx::TextAlignment::CenterRight); + net_tcp_fields.empend("packets_in", "Pkt In", Gfx::TextAlignment::CenterRight); + net_tcp_fields.empend("packets_out", "Pkt Out", Gfx::TextAlignment::CenterRight); + net_tcp_fields.empend("bytes_in", "Bytes In", Gfx::TextAlignment::CenterRight); + net_tcp_fields.empend("bytes_out", "Bytes Out", Gfx::TextAlignment::CenterRight); m_socket_table_view->set_model(GUI::JsonArrayModel::create("/proc/net/tcp", move(net_tcp_fields))); m_update_timer = Core::Timer::construct( diff --git a/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp b/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp index 8529a288814760..ffebaff7acf44c 100644 --- a/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp +++ b/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp @@ -38,23 +38,23 @@ ProcessFileDescriptorMapWidget::ProcessFileDescriptorMapWidget(GUI::Widget* pare m_table_view->set_size_columns_to_fit_content(true); Vector pid_fds_fields; - pid_fds_fields.empend("fd", "FD", TextAlignment::CenterRight); - pid_fds_fields.empend("class", "Class", TextAlignment::CenterLeft); - pid_fds_fields.empend("offset", "Offset", TextAlignment::CenterRight); - pid_fds_fields.empend("absolute_path", "Path", TextAlignment::CenterLeft); - pid_fds_fields.empend("Access", TextAlignment::CenterLeft, [](auto& object) { + pid_fds_fields.empend("fd", "FD", Gfx::TextAlignment::CenterRight); + pid_fds_fields.empend("class", "Class", Gfx::TextAlignment::CenterLeft); + pid_fds_fields.empend("offset", "Offset", Gfx::TextAlignment::CenterRight); + pid_fds_fields.empend("absolute_path", "Path", Gfx::TextAlignment::CenterLeft); + pid_fds_fields.empend("Access", Gfx::TextAlignment::CenterLeft, [](auto& object) { return object.get("seekable").to_bool() ? "Seekable" : "Sequential"; }); - pid_fds_fields.empend("Blocking", TextAlignment::CenterLeft, [](auto& object) { + pid_fds_fields.empend("Blocking", Gfx::TextAlignment::CenterLeft, [](auto& object) { return object.get("blocking").to_bool() ? "Blocking" : "Nonblocking"; }); - pid_fds_fields.empend("On exec", TextAlignment::CenterLeft, [](auto& object) { + pid_fds_fields.empend("On exec", Gfx::TextAlignment::CenterLeft, [](auto& object) { return object.get("cloexec").to_bool() ? "Close" : "Keep"; }); - pid_fds_fields.empend("Can read", TextAlignment::CenterLeft, [](auto& object) { + pid_fds_fields.empend("Can read", Gfx::TextAlignment::CenterLeft, [](auto& object) { return object.get("can_read").to_bool() ? "Yes" : "No"; }); - pid_fds_fields.empend("Can write", TextAlignment::CenterLeft, [](auto& object) { + pid_fds_fields.empend("Can write", Gfx::TextAlignment::CenterLeft, [](auto& object) { return object.get("can_write").to_bool() ? "Yes" : "No"; }); diff --git a/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp b/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp index cc41110f785ec0..36bf4046d0c157 100644 --- a/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp +++ b/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp @@ -39,13 +39,13 @@ ProcessMemoryMapWidget::ProcessMemoryMapWidget(GUI::Widget* parent) m_table_view = GUI::TableView::construct(this); m_table_view->set_size_columns_to_fit_content(true); Vector pid_vm_fields; - pid_vm_fields.empend("Address", TextAlignment::CenterLeft, [](auto& object) { + pid_vm_fields.empend("Address", Gfx::TextAlignment::CenterLeft, [](auto& object) { return String::format("%#x", object.get("address").to_u32()); }); - pid_vm_fields.empend("size", "Size", TextAlignment::CenterRight); - pid_vm_fields.empend("amount_resident", "Resident", TextAlignment::CenterRight); - pid_vm_fields.empend("amount_dirty", "Dirty", TextAlignment::CenterRight); - pid_vm_fields.empend("Access", TextAlignment::CenterLeft, [](auto& object) { + pid_vm_fields.empend("size", "Size", Gfx::TextAlignment::CenterRight); + pid_vm_fields.empend("amount_resident", "Resident", Gfx::TextAlignment::CenterRight); + pid_vm_fields.empend("amount_dirty", "Dirty", Gfx::TextAlignment::CenterRight); + pid_vm_fields.empend("Access", Gfx::TextAlignment::CenterLeft, [](auto& object) { StringBuilder builder; if (!object.get("user_accessible").to_bool()) builder.append('K'); @@ -61,15 +61,15 @@ ProcessMemoryMapWidget::ProcessMemoryMapWidget(GUI::Widget* parent) builder.append('T'); return builder.to_string(); }); - pid_vm_fields.empend("Purgeable", TextAlignment::CenterLeft, [](auto& object) { + pid_vm_fields.empend("Purgeable", Gfx::TextAlignment::CenterLeft, [](auto& object) { if (!object.get("purgeable").to_bool()) return ""; if (object.get("volatile").to_bool()) return "Volatile"; return "Non-volatile"; }); - pid_vm_fields.empend("cow_pages", "# CoW", TextAlignment::CenterRight); - pid_vm_fields.empend("name", "Name", TextAlignment::CenterLeft); + pid_vm_fields.empend("cow_pages", "# CoW", Gfx::TextAlignment::CenterRight); + pid_vm_fields.empend("name", "Name", Gfx::TextAlignment::CenterLeft); m_json_model = GUI::JsonArrayModel::create({}, move(pid_vm_fields)); m_table_view->set_model(GUI::SortingProxyModel::create(*m_json_model)); m_table_view->model()->set_key_column_and_sort_order(0, GUI::SortOrder::Ascending); diff --git a/Applications/SystemMonitor/ProcessModel.cpp b/Applications/SystemMonitor/ProcessModel.cpp index 7fb5a7f8d3da1d..e96ab4b27f0c08 100644 --- a/Applications/SystemMonitor/ProcessModel.cpp +++ b/Applications/SystemMonitor/ProcessModel.cpp @@ -46,10 +46,10 @@ ProcessModel::ProcessModel() { ASSERT(!s_the); s_the = this; - m_generic_process_icon = GraphicsBitmap::load_from_file("/res/icons/gear16.png"); - m_high_priority_icon = GraphicsBitmap::load_from_file("/res/icons/highpriority16.png"); - m_low_priority_icon = GraphicsBitmap::load_from_file("/res/icons/lowpriority16.png"); - m_normal_priority_icon = GraphicsBitmap::load_from_file("/res/icons/normalpriority16.png"); + m_generic_process_icon = Gfx::Bitmap::load_from_file("/res/icons/gear16.png"); + m_high_priority_icon = Gfx::Bitmap::load_from_file("/res/icons/highpriority16.png"); + m_low_priority_icon = Gfx::Bitmap::load_from_file("/res/icons/lowpriority16.png"); + m_normal_priority_icon = Gfx::Bitmap::load_from_file("/res/icons/normalpriority16.png"); } ProcessModel::~ProcessModel() @@ -132,59 +132,59 @@ GUI::Model::ColumnMetadata ProcessModel::column_metadata(int column) const { switch (column) { case Column::Icon: - return { 16, TextAlignment::CenterLeft }; + return { 16, Gfx::TextAlignment::CenterLeft }; case Column::PID: - return { 32, TextAlignment::CenterRight }; + return { 32, Gfx::TextAlignment::CenterRight }; case Column::TID: - return { 32, TextAlignment::CenterRight }; + return { 32, Gfx::TextAlignment::CenterRight }; case Column::State: - return { 75, TextAlignment::CenterLeft }; + return { 75, Gfx::TextAlignment::CenterLeft }; case Column::Priority: - return { 16, TextAlignment::CenterRight }; + return { 16, Gfx::TextAlignment::CenterRight }; case Column::EffectivePriority: - return { 16, TextAlignment::CenterRight }; + return { 16, Gfx::TextAlignment::CenterRight }; case Column::User: - return { 50, TextAlignment::CenterLeft }; + return { 50, Gfx::TextAlignment::CenterLeft }; case Column::Virtual: - return { 65, TextAlignment::CenterRight }; + return { 65, Gfx::TextAlignment::CenterRight }; case Column::Physical: - return { 65, TextAlignment::CenterRight }; + return { 65, Gfx::TextAlignment::CenterRight }; case Column::DirtyPrivate: - return { 65, TextAlignment::CenterRight }; + return { 65, Gfx::TextAlignment::CenterRight }; case Column::CleanInode: - return { 65, TextAlignment::CenterRight }; + return { 65, Gfx::TextAlignment::CenterRight }; case Column::PurgeableVolatile: - return { 65, TextAlignment::CenterRight }; + return { 65, Gfx::TextAlignment::CenterRight }; case Column::PurgeableNonvolatile: - return { 65, TextAlignment::CenterRight }; + return { 65, Gfx::TextAlignment::CenterRight }; case Column::CPU: - return { 32, TextAlignment::CenterRight }; + return { 32, Gfx::TextAlignment::CenterRight }; case Column::Name: - return { 140, TextAlignment::CenterLeft }; + return { 140, Gfx::TextAlignment::CenterLeft }; case Column::Syscalls: - return { 60, TextAlignment::CenterRight }; + return { 60, Gfx::TextAlignment::CenterRight }; case Column::InodeFaults: - return { 60, TextAlignment::CenterRight }; + return { 60, Gfx::TextAlignment::CenterRight }; case Column::ZeroFaults: - return { 60, TextAlignment::CenterRight }; + return { 60, Gfx::TextAlignment::CenterRight }; case Column::CowFaults: - return { 60, TextAlignment::CenterRight }; + return { 60, Gfx::TextAlignment::CenterRight }; case Column::FileReadBytes: - return { 60, TextAlignment::CenterRight }; + return { 60, Gfx::TextAlignment::CenterRight }; case Column::FileWriteBytes: - return { 60, TextAlignment::CenterRight }; + return { 60, Gfx::TextAlignment::CenterRight }; case Column::UnixSocketReadBytes: - return { 60, TextAlignment::CenterRight }; + return { 60, Gfx::TextAlignment::CenterRight }; case Column::UnixSocketWriteBytes: - return { 60, TextAlignment::CenterRight }; + return { 60, Gfx::TextAlignment::CenterRight }; case Column::IPv4SocketReadBytes: - return { 60, TextAlignment::CenterRight }; + return { 60, Gfx::TextAlignment::CenterRight }; case Column::IPv4SocketWriteBytes: - return { 60, TextAlignment::CenterRight }; + return { 60, Gfx::TextAlignment::CenterRight }; case Column::Pledge: - return { 60, TextAlignment::CenterLeft }; + return { 60, Gfx::TextAlignment::CenterLeft }; case Column::Veil: - return { 60, TextAlignment::CenterLeft }; + return { 60, Gfx::TextAlignment::CenterLeft }; default: ASSERT_NOT_REACHED(); } @@ -269,7 +269,7 @@ GUI::Variant ProcessModel::data(const GUI::ModelIndex& index, Role role) const if (thread.current_state.icon_id != -1) { auto icon_buffer = SharedBuffer::create_from_shared_buffer_id(thread.current_state.icon_id); if (icon_buffer) { - auto icon_bitmap = GraphicsBitmap::create_with_shared_buffer(GraphicsBitmap::Format::RGBA32, *icon_buffer, { 16, 16 }); + auto icon_bitmap = Gfx::Bitmap::create_with_shared_buffer(Gfx::Bitmap::Format::RGBA32, *icon_buffer, { 16, 16 }); if (icon_bitmap) return *icon_bitmap; } diff --git a/Applications/SystemMonitor/ProcessModel.h b/Applications/SystemMonitor/ProcessModel.h index 232670845d8664..815fefafa96e2f 100644 --- a/Applications/SystemMonitor/ProcessModel.h +++ b/Applications/SystemMonitor/ProcessModel.h @@ -132,10 +132,10 @@ class ProcessModel final : public GUI::Model { HashMap m_usernames; HashMap> m_threads; Vector m_pids; - RefPtr m_generic_process_icon; - RefPtr m_high_priority_icon; - RefPtr m_low_priority_icon; - RefPtr m_normal_priority_icon; + RefPtr m_generic_process_icon; + RefPtr m_high_priority_icon; + RefPtr m_low_priority_icon; + RefPtr m_normal_priority_icon; }; namespace AK { diff --git a/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp b/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp index 5c713675bc607c..292495463d5c71 100644 --- a/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp +++ b/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp @@ -38,8 +38,8 @@ ProcessUnveiledPathsWidget::ProcessUnveiledPathsWidget(GUI::Widget* parent) m_table_view->set_size_columns_to_fit_content(true); Vector pid_unveil_fields; - pid_unveil_fields.empend("path", "Path", TextAlignment::CenterLeft); - pid_unveil_fields.empend("permissions", "Permissions", TextAlignment::CenterLeft); + pid_unveil_fields.empend("path", "Path", Gfx::TextAlignment::CenterLeft); + pid_unveil_fields.empend("permissions", "Permissions", Gfx::TextAlignment::CenterLeft); m_table_view->set_model(GUI::JsonArrayModel::create({}, move(pid_unveil_fields))); } diff --git a/Applications/SystemMonitor/main.cpp b/Applications/SystemMonitor/main.cpp index 26ef36f34aacec..c6e5ec29888b3d 100644 --- a/Applications/SystemMonitor/main.cpp +++ b/Applications/SystemMonitor/main.cpp @@ -152,19 +152,19 @@ int main(int argc, char** argv) memory_stats_widget->refresh(); }, window); - auto kill_action = GUI::Action::create("Kill process", { Mod_Ctrl, Key_K }, GraphicsBitmap::load_from_file("/res/icons/kill16.png"), [process_table_view](const GUI::Action&) { + auto kill_action = GUI::Action::create("Kill process", { Mod_Ctrl, Key_K }, Gfx::Bitmap::load_from_file("/res/icons/kill16.png"), [process_table_view](const GUI::Action&) { pid_t pid = process_table_view->selected_pid(); if (pid != -1) kill(pid, SIGKILL); }); - auto stop_action = GUI::Action::create("Stop process", { Mod_Ctrl, Key_S }, GraphicsBitmap::load_from_file("/res/icons/stop16.png"), [process_table_view](const GUI::Action&) { + auto stop_action = GUI::Action::create("Stop process", { Mod_Ctrl, Key_S }, Gfx::Bitmap::load_from_file("/res/icons/stop16.png"), [process_table_view](const GUI::Action&) { pid_t pid = process_table_view->selected_pid(); if (pid != -1) kill(pid, SIGSTOP); }); - auto continue_action = GUI::Action::create("Continue process", { Mod_Ctrl, Key_C }, GraphicsBitmap::load_from_file("/res/icons/continue16.png"), [process_table_view](const GUI::Action&) { + auto continue_action = GUI::Action::create("Continue process", { Mod_Ctrl, Key_C }, Gfx::Bitmap::load_from_file("/res/icons/continue16.png"), [process_table_view](const GUI::Action&) { pid_t pid = process_table_view->selected_pid(); if (pid != -1) kill(pid, SIGCONT); @@ -222,7 +222,7 @@ int main(int argc, char** argv) auto help_menu = GUI::Menu::construct("Help"); help_menu->add_action(GUI::Action::create("About", [&](const GUI::Action&) { - GUI::AboutDialog::show("System Monitor", load_png("/res/icons/32x32/app-system-monitor.png"), window); + GUI::AboutDialog::show("System Monitor", Gfx::load_png("/res/icons/32x32/app-system-monitor.png"), window); })); menubar->add_menu(move(help_menu)); @@ -251,7 +251,7 @@ int main(int argc, char** argv) window->show(); - window->set_icon(load_png("/res/icons/16x16/app-system-monitor.png")); + window->set_icon(Gfx::load_png("/res/icons/16x16/app-system-monitor.png")); return app.exec(); } @@ -260,7 +260,7 @@ class ProgressBarPaintingDelegate final : public GUI::TableCellPaintingDelegate public: virtual ~ProgressBarPaintingDelegate() override {} - virtual void paint(GUI::Painter& painter, const Rect& a_rect, const Palette& palette, const GUI::Model& model, const GUI::ModelIndex& index) override + virtual void paint(GUI::Painter& painter, const Gfx::Rect& a_rect, const Palette& palette, const GUI::Model& model, const GUI::ModelIndex& index) override { auto rect = a_rect.shrunken(2, 2); auto percentage = model.data(index, GUI::Model::Role::Custom).to_i32(); @@ -269,7 +269,7 @@ class ProgressBarPaintingDelegate final : public GUI::TableCellPaintingDelegate String text; if (data.is_string()) text = data.as_string(); - StylePainter::paint_progress_bar(painter, rect, palette, 0, 100, percentage, text); + Gfx::StylePainter::paint_progress_bar(painter, rect, palette, 0, 100, percentage, text); painter.draw_rect(rect, Color::Black); } }; @@ -285,11 +285,11 @@ RefPtr build_file_systems_tab() fs_table_view->set_size_columns_to_fit_content(true); Vector df_fields; - df_fields.empend("mount_point", "Mount point", TextAlignment::CenterLeft); - df_fields.empend("class_name", "Class", TextAlignment::CenterLeft); - df_fields.empend("device", "Device", TextAlignment::CenterLeft); + df_fields.empend("mount_point", "Mount point", Gfx::TextAlignment::CenterLeft); + df_fields.empend("class_name", "Class", Gfx::TextAlignment::CenterLeft); + df_fields.empend("device", "Device", Gfx::TextAlignment::CenterLeft); df_fields.empend( - "Size", TextAlignment::CenterRight, + "Size", Gfx::TextAlignment::CenterRight, [](const JsonObject& object) { return human_readable_size(object.get("total_block_count").to_u32() * object.get("block_size").to_u32()); }, @@ -297,7 +297,7 @@ RefPtr build_file_systems_tab() return object.get("total_block_count").to_u32() * object.get("block_size").to_u32(); }); df_fields.empend( - "Used", TextAlignment::CenterRight, + "Used", Gfx::TextAlignment::CenterRight, [](const JsonObject& object) { auto total_blocks = object.get("total_block_count").to_u32(); auto free_blocks = object.get("free_block_count").to_u32(); @@ -319,17 +319,17 @@ RefPtr build_file_systems_tab() return percentage; }); df_fields.empend( - "Available", TextAlignment::CenterRight, + "Available", Gfx::TextAlignment::CenterRight, [](const JsonObject& object) { return human_readable_size(object.get("free_block_count").to_u32() * object.get("block_size").to_u32()); }, [](const JsonObject& object) { return object.get("free_block_count").to_u32() * object.get("block_size").to_u32(); }); - df_fields.empend("Access", TextAlignment::CenterLeft, [](const JsonObject& object) { + df_fields.empend("Access", Gfx::TextAlignment::CenterLeft, [](const JsonObject& object) { return object.get("readonly").to_bool() ? "Read-only" : "Read/Write"; }); - df_fields.empend("Mount flags", TextAlignment::CenterLeft, [](const JsonObject& object) { + df_fields.empend("Mount flags", Gfx::TextAlignment::CenterLeft, [](const JsonObject& object) { int mount_flags = object.get("mount_flags").to_int(); StringBuilder builder; bool first = true; @@ -349,11 +349,11 @@ RefPtr build_file_systems_tab() return String("defaults"); return builder.to_string(); }); - df_fields.empend("free_block_count", "Free blocks", TextAlignment::CenterRight); - df_fields.empend("total_block_count", "Total blocks", TextAlignment::CenterRight); - df_fields.empend("free_inode_count", "Free inodes", TextAlignment::CenterRight); - df_fields.empend("total_inode_count", "Total inodes", TextAlignment::CenterRight); - df_fields.empend("block_size", "Block size", TextAlignment::CenterRight); + df_fields.empend("free_block_count", "Free blocks", Gfx::TextAlignment::CenterRight); + df_fields.empend("total_block_count", "Total blocks", Gfx::TextAlignment::CenterRight); + df_fields.empend("free_inode_count", "Free inodes", Gfx::TextAlignment::CenterRight); + df_fields.empend("total_inode_count", "Total inodes", Gfx::TextAlignment::CenterRight); + df_fields.empend("block_size", "Block size", Gfx::TextAlignment::CenterRight); fs_table_view->set_model(GUI::SortingProxyModel::create(GUI::JsonArrayModel::create("/proc/df", move(df_fields)))); fs_table_view->set_cell_painting_delegate(3, make()); @@ -377,7 +377,7 @@ RefPtr build_pci_devices_tab() Vector pci_fields; pci_fields.empend( - "Address", TextAlignment::CenterLeft, + "Address", Gfx::TextAlignment::CenterLeft, [](const JsonObject& object) { auto seg = object.get("seg").to_u32(); auto bus = object.get("bus").to_u32(); @@ -386,21 +386,21 @@ RefPtr build_pci_devices_tab() return String::format("%04x:%02x:%02x.%d", seg, bus, slot, function); }); pci_fields.empend( - "Class", TextAlignment::CenterLeft, + "Class", Gfx::TextAlignment::CenterLeft, [db](const JsonObject& object) { auto class_id = object.get("class").to_u32(); String class_name = db->get_class(class_id); return class_name == "" ? String::format("%04x", class_id) : class_name; }); pci_fields.empend( - "Vendor", TextAlignment::CenterLeft, + "Vendor", Gfx::TextAlignment::CenterLeft, [db](const JsonObject& object) { auto vendor_id = object.get("vendor_id").to_u32(); String vendor_name = db->get_vendor(vendor_id); return vendor_name == "" ? String::format("%02x", vendor_id) : vendor_name; }); pci_fields.empend( - "Device", TextAlignment::CenterLeft, + "Device", Gfx::TextAlignment::CenterLeft, [db](const JsonObject& object) { auto vendor_id = object.get("vendor_id").to_u32(); auto device_id = object.get("device_id").to_u32(); @@ -408,7 +408,7 @@ RefPtr build_pci_devices_tab() return device_name == "" ? String::format("%02x", device_id) : device_name; }); pci_fields.empend( - "Revision", TextAlignment::CenterRight, + "Revision", Gfx::TextAlignment::CenterRight, [](const JsonObject& object) { auto revision_id = object.get("revision_id").to_u32(); return String::format("%02x", revision_id); diff --git a/Applications/Taskbar/TaskbarWindow.cpp b/Applications/Taskbar/TaskbarWindow.cpp index 3049379d8bbe64..af367d16a688df 100644 --- a/Applications/Taskbar/TaskbarWindow.cpp +++ b/Applications/Taskbar/TaskbarWindow.cpp @@ -44,7 +44,7 @@ TaskbarWindow::TaskbarWindow() on_screen_rect_change(GUI::Desktop::the().rect()); - GUI::Desktop::the().on_rect_change = [this](const Rect& rect) { on_screen_rect_change(rect); }; + GUI::Desktop::the().on_rect_change = [this](const Gfx::Rect& rect) { on_screen_rect_change(rect); }; auto widget = GUI::Frame::construct(); widget->set_fill_with_background_color(true); @@ -52,8 +52,8 @@ TaskbarWindow::TaskbarWindow() widget->layout()->set_margins({ 3, 2, 3, 2 }); widget->layout()->set_spacing(3); widget->set_frame_thickness(1); - widget->set_frame_shape(FrameShape::Panel); - widget->set_frame_shadow(FrameShadow::Raised); + widget->set_frame_shape(Gfx::FrameShape::Panel); + widget->set_frame_shadow(Gfx::FrameShadow::Raised); set_main_widget(widget); WindowList::the().aid_create_button = [this](auto& identifier) { @@ -75,8 +75,8 @@ void TaskbarWindow::create_quick_launch_bar() quick_launch_bar->layout()->set_spacing(3); quick_launch_bar->layout()->set_margins({ 3, 0, 3, 0 }); quick_launch_bar->set_frame_thickness(1); - quick_launch_bar->set_frame_shape(FrameShape::Container); - quick_launch_bar->set_frame_shadow(FrameShadow::Raised); + quick_launch_bar->set_frame_shape(Gfx::FrameShape::Container); + quick_launch_bar->set_frame_shadow(Gfx::FrameShadow::Raised); int total_width = 6; bool first = true; @@ -96,9 +96,9 @@ void TaskbarWindow::create_quick_launch_bar() auto button = GUI::Button::construct(quick_launch_bar); button->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); button->set_preferred_size(22, 22); - button->set_button_style(ButtonStyle::CoolBar); + button->set_button_style(Gfx::ButtonStyle::CoolBar); - button->set_icon(GraphicsBitmap::load_from_file(app_icon_path)); + button->set_icon(Gfx::Bitmap::load_from_file(app_icon_path)); // FIXME: the tooltip ends up outside the screen rect. button->set_tooltip(name); button->on_click = [app_executable](auto&) { @@ -121,7 +121,7 @@ void TaskbarWindow::create_quick_launch_bar() quick_launch_bar->set_preferred_size(total_width, 22); } -void TaskbarWindow::on_screen_rect_change(const Rect& rect) +void TaskbarWindow::on_screen_rect_change(const Gfx::Rect& rect) { Rect new_rect { rect.x(), rect.bottom() - taskbar_height() + 1, rect.width(), taskbar_height() }; set_rect(new_rect); @@ -133,7 +133,7 @@ NonnullRefPtr TaskbarWindow::create_button(const WindowIdentifier& button->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); button->set_preferred_size(140, 22); button->set_checkable(true); - button->set_text_alignment(TextAlignment::CenterLeft); + button->set_text_alignment(Gfx::TextAlignment::CenterLeft); return button; } @@ -179,7 +179,7 @@ void TaskbarWindow::wm_event(GUI::WMEvent& event) if (auto* window = WindowList::the().window(identifier)) { auto buffer = SharedBuffer::create_from_shared_buffer_id(changed_event.icon_buffer_id()); ASSERT(buffer); - window->button()->set_icon(GraphicsBitmap::create_with_shared_buffer(GraphicsBitmap::Format::RGBA32, *buffer, changed_event.icon_size())); + window->button()->set_icon(Gfx::Bitmap::create_with_shared_buffer(Gfx::Bitmap::Format::RGBA32, *buffer, changed_event.icon_size())); } break; } diff --git a/Applications/Taskbar/TaskbarWindow.h b/Applications/Taskbar/TaskbarWindow.h index 6e42a6ba380f55..aec46cddfb6f58 100644 --- a/Applications/Taskbar/TaskbarWindow.h +++ b/Applications/Taskbar/TaskbarWindow.h @@ -38,7 +38,7 @@ class TaskbarWindow final : public GUI::Window { private: void create_quick_launch_bar(); - void on_screen_rect_change(const Rect&); + void on_screen_rect_change(const Gfx::Rect&); NonnullRefPtr create_button(const WindowIdentifier&); virtual void wm_event(GUI::WMEvent&) override; diff --git a/Applications/Taskbar/WindowList.h b/Applications/Taskbar/WindowList.h index 5ea89e5916c50a..38ef9e34098203 100644 --- a/Applications/Taskbar/WindowList.h +++ b/Applications/Taskbar/WindowList.h @@ -51,7 +51,7 @@ class Window { void set_title(const String& title) { m_title = title; } Rect rect() const { return m_rect; } - void set_rect(const Rect& rect) { m_rect = rect; } + void set_rect(const Gfx::Rect& rect) { m_rect = rect; } GUI::Button* button() { return m_button; } void set_button(GUI::Button* button) { m_button = button; } @@ -62,14 +62,14 @@ class Window { void set_minimized(bool minimized) { m_minimized = minimized; } bool is_minimized() const { return m_minimized; } - const GraphicsBitmap* icon() const { return m_icon.ptr(); } + const Gfx::Bitmap* icon() const { return m_icon.ptr(); } private: WindowIdentifier m_identifier; String m_title; - Rect m_rect; + Gfx::Rect m_rect; RefPtr m_button; - RefPtr m_icon; + RefPtr m_icon; bool m_active { false }; bool m_minimized { false }; }; diff --git a/Applications/Terminal/main.cpp b/Applications/Terminal/main.cpp index 7a4f31ab458a44..4db3cdfea59f02 100644 --- a/Applications/Terminal/main.cpp +++ b/Applications/Terminal/main.cpp @@ -235,7 +235,7 @@ int main(int argc, char** argv) window->move_to(300, 300); terminal->apply_size_increments_to_window(*window); window->show(); - window->set_icon(load_png("/res/icons/16x16/app-terminal.png")); + window->set_icon(Gfx::load_png("/res/icons/16x16/app-terminal.png")); terminal->set_should_beep(config->read_bool_entry("Window", "AudibleBeep", false)); RefPtr settings_window; @@ -247,13 +247,13 @@ int main(int argc, char** argv) auto menubar = make(); auto app_menu = GUI::Menu::construct("Terminal"); - app_menu->add_action(GUI::Action::create("Open new terminal", { Mod_Ctrl | Mod_Shift, Key_N }, GraphicsBitmap::load_from_file("/res/icons/16x16/app-terminal.png"), [&](auto&) { + app_menu->add_action(GUI::Action::create("Open new terminal", { Mod_Ctrl | Mod_Shift, Key_N }, Gfx::Bitmap::load_from_file("/res/icons/16x16/app-terminal.png"), [&](auto&) { if (!fork()) { execl("/bin/Terminal", "Terminal", nullptr); exit(1); } })); - app_menu->add_action(GUI::Action::create("Settings...", load_png("/res/icons/gear16.png"), + app_menu->add_action(GUI::Action::create("Settings...", Gfx::load_png("/res/icons/gear16.png"), [&](const GUI::Action&) { if (!settings_window) { settings_window = create_settings_window(*terminal); @@ -300,7 +300,7 @@ int main(int argc, char** argv) auto help_menu = GUI::Menu::construct("Help"); help_menu->add_action(GUI::Action::create("About", [&](const GUI::Action&) { - GUI::AboutDialog::show("Terminal", load_png("/res/icons/32x32/app-terminal.png"), window); + GUI::AboutDialog::show("Terminal", Gfx::load_png("/res/icons/32x32/app-terminal.png"), window); })); menubar->add_menu(move(help_menu)); diff --git a/Applications/TextEditor/TextEditorWidget.cpp b/Applications/TextEditor/TextEditorWidget.cpp index 32cd3c6b47b990..45ae429218d4e4 100644 --- a/Applications/TextEditor/TextEditorWidget.cpp +++ b/Applications/TextEditor/TextEditorWidget.cpp @@ -243,7 +243,7 @@ TextEditorWidget::TextEditorWidget() m_editor->set_focus(true); }; - m_find_replace_action = GUI::Action::create("Find/Replace...", { Mod_Ctrl, Key_F }, load_png("/res/icons/16x16/find.png"), [this](auto&) { + m_find_replace_action = GUI::Action::create("Find/Replace...", { Mod_Ctrl, Key_F }, Gfx::load_png("/res/icons/16x16/find.png"), [this](auto&) { m_find_replace_widget->set_visible(true); m_find_widget->set_visible(true); m_replace_widget->set_visible(true); @@ -268,7 +268,7 @@ TextEditorWidget::TextEditorWidget() m_statusbar->set_text(builder.to_string()); }; - m_new_action = GUI::Action::create("New", { Mod_Ctrl, Key_N }, GraphicsBitmap::load_from_file("/res/icons/16x16/new.png"), [this](const GUI::Action&) { + m_new_action = GUI::Action::create("New", { Mod_Ctrl, Key_N }, Gfx::Bitmap::load_from_file("/res/icons/16x16/new.png"), [this](const GUI::Action&) { if (m_document_dirty) { auto save_document_first_box = GUI::MessageBox::construct("Save Document First?", "Warning", GUI::MessageBox::Type::Warning, GUI::MessageBox::InputType::OKCancel, window()); auto save_document_first_result = save_document_first_box->exec(); @@ -301,7 +301,7 @@ TextEditorWidget::TextEditorWidget() open_sesame(open_path.value()); }); - m_save_as_action = GUI::Action::create("Save as...", { Mod_Ctrl | Mod_Shift, Key_S }, GraphicsBitmap::load_from_file("/res/icons/16x16/save.png"), [this](const GUI::Action&) { + m_save_as_action = GUI::Action::create("Save as...", { Mod_Ctrl | Mod_Shift, Key_S }, Gfx::Bitmap::load_from_file("/res/icons/16x16/save.png"), [this](const GUI::Action&) { Optional save_path = GUI::FilePicker::get_save_filepath(m_name.is_null() ? "Untitled" : m_name, m_extension.is_null() ? "txt" : m_extension); if (!save_path.has_value()) return; @@ -316,7 +316,7 @@ TextEditorWidget::TextEditorWidget() dbg() << "Wrote document to " << save_path.value(); }); - m_save_action = GUI::Action::create("Save", { Mod_Ctrl, Key_S }, GraphicsBitmap::load_from_file("/res/icons/16x16/save.png"), [&](const GUI::Action&) { + m_save_action = GUI::Action::create("Save", { Mod_Ctrl, Key_S }, Gfx::Bitmap::load_from_file("/res/icons/16x16/save.png"), [&](const GUI::Action&) { if (!m_path.is_empty()) { if (!m_editor->write_to_file(m_path)) { GUI::MessageBox::show("Unable to save file.\n", "Error", GUI::MessageBox::Type::Error, GUI::MessageBox::InputType::OK, window()); @@ -384,7 +384,7 @@ TextEditorWidget::TextEditorWidget() auto help_menu = GUI::Menu::construct("Help"); help_menu->add_action(GUI::Action::create("About", [&](const GUI::Action&) { - GUI::AboutDialog::show("Text Editor", load_png("/res/icons/32x32/app-texteditor.png"), window()); + GUI::AboutDialog::show("Text Editor", Gfx::load_png("/res/icons/32x32/app-texteditor.png"), window()); })); menubar->add_menu(move(help_menu)); diff --git a/Applications/TextEditor/main.cpp b/Applications/TextEditor/main.cpp index 7b4b82a96b8137..6f7f94b0559ce1 100644 --- a/Applications/TextEditor/main.cpp +++ b/Applications/TextEditor/main.cpp @@ -61,7 +61,7 @@ int main(int argc, char** argv) text_widget->open_sesame(argv[1]); window->show(); - window->set_icon(load_png("/res/icons/TextEditor16.png")); + window->set_icon(Gfx::load_png("/res/icons/TextEditor16.png")); return app.exec(); } diff --git a/Applications/Welcome/TextWidget.cpp b/Applications/Welcome/TextWidget.cpp index c709478e033010..97c687fdf140b2 100644 --- a/Applications/Welcome/TextWidget.cpp +++ b/Applications/Welcome/TextWidget.cpp @@ -75,10 +75,10 @@ void TextWidget::paint_event(GUI::PaintEvent& event) text_rect.set_width(text_rect.width() - indent * 2); if (is_enabled()) { - painter.draw_text(text_rect, line, m_text_alignment, palette().color(foreground_role()), TextElision::None); + painter.draw_text(text_rect, line, m_text_alignment, palette().color(foreground_role()), Gfx::TextElision::None); } else { - painter.draw_text(text_rect.translated(1, 1), line, font(), text_alignment(), Color::White, TextElision::Right); - painter.draw_text(text_rect, line, font(), text_alignment(), Color::from_rgb(0x808080), TextElision::Right); + painter.draw_text(text_rect.translated(1, 1), line, font(), text_alignment(), Color::White, Gfx::TextElision::Right); + painter.draw_text(text_rect, line, font(), text_alignment(), Color::from_rgb(0x808080), Gfx::TextElision::Right); } } } diff --git a/Applications/Welcome/TextWidget.h b/Applications/Welcome/TextWidget.h index 153067819f7b99..a8876638b7a25c 100644 --- a/Applications/Welcome/TextWidget.h +++ b/Applications/Welcome/TextWidget.h @@ -41,8 +41,8 @@ class TextWidget : public GUI::Frame { String text() const { return m_text; } void set_text(const StringView&); - TextAlignment text_alignment() const { return m_text_alignment; } - void set_text_alignment(TextAlignment text_alignment) { m_text_alignment = text_alignment; } + Gfx::TextAlignment text_alignment() const { return m_text_alignment; } + void set_text_alignment(Gfx::TextAlignment text_alignment) { m_text_alignment = text_alignment; } bool should_wrap() const { return m_should_wrap; } void set_should_wrap(bool should_wrap) { m_should_wrap = should_wrap; } @@ -58,7 +58,7 @@ class TextWidget : public GUI::Frame { String m_text; Vector m_lines; - TextAlignment m_text_alignment { TextAlignment::Center }; + Gfx::TextAlignment m_text_alignment { Gfx::TextAlignment::Center }; bool m_should_wrap { false }; int m_line_height { 0 }; }; diff --git a/Applications/Welcome/main.cpp b/Applications/Welcome/main.cpp index 14855d50aca5e0..47231ee1a0c22d 100644 --- a/Applications/Welcome/main.cpp +++ b/Applications/Welcome/main.cpp @@ -101,7 +101,7 @@ int main(int argc, char** argv) background->set_layout(make()); background->layout()->set_margins({ 8, 8, 8, 8 }); background->layout()->set_spacing(8); - background->set_icon(load_png_from_memory((const u8*)&_binary_background_png_start, (size_t)&_binary_background_png_size)); + background->set_icon(Gfx::load_png_from_memory((const u8*)&_binary_background_png_start, (size_t)&_binary_background_png_size)); background->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); background->set_preferred_size(background->icon()->size()); @@ -110,9 +110,9 @@ int main(int argc, char** argv) // auto header = GUI::Label::construct(background.ptr()); - header->set_font(Font::default_bold_font()); + header->set_font(Gfx::Font::default_bold_font()); header->set_text("Welcome to Serenity"); - header->set_text_alignment(TextAlignment::CenterLeft); + header->set_text_alignment(Gfx::TextAlignment::CenterLeft); header->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); header->set_preferred_size(0, 30); @@ -144,25 +144,25 @@ int main(int argc, char** argv) content->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); auto content_title = GUI::Label::construct(content); - content_title->set_font(Font::default_bold_font()); + content_title->set_font(Gfx::Font::default_bold_font()); content_title->set_text(page.title); - content_title->set_text_alignment(TextAlignment::CenterLeft); + content_title->set_text_alignment(Gfx::TextAlignment::CenterLeft); content_title->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); content_title->set_preferred_size(0, 10); for (auto& paragraph : page.content) { auto content_text = TextWidget::construct(content); - content_text->set_font(Font::default_font()); + content_text->set_font(Gfx::Font::default_font()); content_text->set_text(paragraph); - content_text->set_text_alignment(TextAlignment::TopLeft); + content_text->set_text_alignment(Gfx::TextAlignment::TopLeft); content_text->set_line_height(12); content_text->wrap_and_set_height(); } auto menu_option = GUI::Button::construct(menu); - menu_option->set_font(Font::default_font()); + menu_option->set_font(Gfx::Font::default_font()); menu_option->set_text(page.menu_name); - menu_option->set_text_alignment(TextAlignment::CenterLeft); + menu_option->set_text_alignment(Gfx::TextAlignment::CenterLeft); menu_option->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); menu_option->set_preferred_size(0, 20); menu_option->on_click = [content = content.ptr(), &stack](auto&) { diff --git a/Demos/Fire/Fire.cpp b/Demos/Fire/Fire.cpp index 34ce85efcb1f2f..659cc4b240c321 100644 --- a/Demos/Fire/Fire.cpp +++ b/Demos/Fire/Fire.cpp @@ -97,7 +97,7 @@ class Fire : public GUI::Widget { private: explicit Fire(GUI::Widget* parent = nullptr); - RefPtr bitmap; + RefPtr bitmap; RefPtr stats; virtual void paint_event(GUI::PaintEvent&) override; @@ -115,7 +115,7 @@ class Fire : public GUI::Widget { Fire::Fire(GUI::Widget* parent) : GUI::Widget(parent) { - bitmap = GraphicsBitmap::create(GraphicsBitmap::Format::Indexed8, { 320, 200 }); + bitmap = Gfx::Bitmap::create(Gfx::Bitmap::Format::Indexed8, { 320, 200 }); /* Initialize fire palette */ for (int i = 0; i < 30; i++) @@ -257,7 +257,7 @@ int main(int argc, char** argv) fire->set_stat_label(time); window->show(); - window->set_icon(load_png("/res/icons/16x16/app-demo.png")); + window->set_icon(Gfx::load_png("/res/icons/16x16/app-demo.png")); return app.exec(); } diff --git a/DevTools/HackStudio/CursorTool.cpp b/DevTools/HackStudio/CursorTool.cpp index bb298c6e1d5d65..6f180bb27e4b16 100644 --- a/DevTools/HackStudio/CursorTool.cpp +++ b/DevTools/HackStudio/CursorTool.cpp @@ -150,7 +150,7 @@ void CursorTool::on_keydown(GUI::KeyEvent& event) } } -void CursorTool::set_rubber_band_position(const Point& position) +void CursorTool::set_rubber_band_position(const Gfx::Point& position) { if (m_rubber_band_position == position) return; diff --git a/DevTools/HackStudio/CursorTool.h b/DevTools/HackStudio/CursorTool.h index 2e31951fb3aa56..b001030dd96de1 100644 --- a/DevTools/HackStudio/CursorTool.h +++ b/DevTools/HackStudio/CursorTool.h @@ -50,14 +50,14 @@ class CursorTool final : public Tool { virtual void on_keydown(GUI::KeyEvent&) override; virtual void on_second_paint(GUI::Painter&, GUI::PaintEvent&) override; - void set_rubber_band_position(const Point&); - Rect rubber_band_rect() const; + void set_rubber_band_position(const Gfx::Point&); + Gfx::Rect rubber_band_rect() const; - Point m_drag_origin; + Gfx::Point m_drag_origin; HashMap m_positions_before_drag; bool m_dragging { false }; bool m_rubber_banding { false }; - Point m_rubber_band_origin; - Point m_rubber_band_position; + Gfx::Point m_rubber_band_origin; + Gfx::Point m_rubber_band_position; }; diff --git a/DevTools/HackStudio/Editor.cpp b/DevTools/HackStudio/Editor.cpp index c034f616525dab..bc86d763fb0f45 100644 --- a/DevTools/HackStudio/Editor.cpp +++ b/DevTools/HackStudio/Editor.cpp @@ -114,7 +114,7 @@ static HashMap& man_paths() return paths; } -void Editor::show_documentation_tooltip_if_available(const String& hovered_token, const Point& screen_location) +void Editor::show_documentation_tooltip_if_available(const String& hovered_token, const Gfx::Point& screen_location) { auto it = man_paths().find(hovered_token); if (it == man_paths().end()) { diff --git a/DevTools/HackStudio/Editor.h b/DevTools/HackStudio/Editor.h index 9c645b16fb91d6..f7d682f555e53a 100644 --- a/DevTools/HackStudio/Editor.h +++ b/DevTools/HackStudio/Editor.h @@ -50,7 +50,7 @@ class Editor final : public GUI::TextEditor { virtual void mousemove_event(GUI::MouseEvent&) override; virtual void cursor_did_change() override; - void show_documentation_tooltip_if_available(const String&, const Point& screen_location); + void show_documentation_tooltip_if_available(const String&, const Gfx::Point& screen_location); void highlight_matching_token_pair(); explicit Editor(GUI::Widget* parent); diff --git a/DevTools/HackStudio/EditorWrapper.cpp b/DevTools/HackStudio/EditorWrapper.cpp index d767b8ea64d161..8906af276e8049 100644 --- a/DevTools/HackStudio/EditorWrapper.cpp +++ b/DevTools/HackStudio/EditorWrapper.cpp @@ -46,12 +46,12 @@ EditorWrapper::EditorWrapper(GUI::Widget* parent) label_wrapper->layout()->set_margins({ 2, 0, 2, 0 }); m_filename_label = GUI::Label::construct("(Untitled)", label_wrapper); - m_filename_label->set_text_alignment(TextAlignment::CenterLeft); + m_filename_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); m_filename_label->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); m_filename_label->set_preferred_size(0, 14); m_cursor_label = GUI::Label::construct("(Cursor)", label_wrapper); - m_cursor_label->set_text_alignment(TextAlignment::CenterRight); + m_cursor_label->set_text_alignment(Gfx::TextAlignment::CenterRight); m_cursor_label->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); m_cursor_label->set_preferred_size(0, 14); @@ -75,5 +75,5 @@ EditorWrapper::~EditorWrapper() void EditorWrapper::set_editor_has_focus(Badge, bool focus) { - m_filename_label->set_font(focus ? Font::default_bold_font() : Font::default_font()); + m_filename_label->set_font(focus ? Gfx::Font::default_bold_font() : Gfx::Font::default_font()); } diff --git a/DevTools/HackStudio/FindInFilesWidget.cpp b/DevTools/HackStudio/FindInFilesWidget.cpp index ad8d04235f9295..b41acbe3768410 100644 --- a/DevTools/HackStudio/FindInFilesWidget.cpp +++ b/DevTools/HackStudio/FindInFilesWidget.cpp @@ -92,7 +92,7 @@ class SearchResultsModel final : public GUI::Model { virtual ColumnMetadata column_metadata(int column) const override { if (column == Column::MatchedText) { - return { 0, TextAlignment::CenterLeft, &Font::default_fixed_width_font() }; + return { 0, Gfx::TextAlignment::CenterLeft, &Gfx::Font::default_fixed_width_font() }; } return {}; } diff --git a/DevTools/HackStudio/FormEditorWidget.cpp b/DevTools/HackStudio/FormEditorWidget.cpp index 97c1502cb4a64d..070f09a1699ff3 100644 --- a/DevTools/HackStudio/FormEditorWidget.cpp +++ b/DevTools/HackStudio/FormEditorWidget.cpp @@ -37,8 +37,8 @@ FormEditorWidget::FormEditorWidget(GUI::Widget* parent) set_fill_with_background_color(true); set_background_color(Color::MidGray); - set_frame_shape(FrameShape::Container); - set_frame_shadow(FrameShadow::Sunken); + set_frame_shape(Gfx::FrameShape::Container); + set_frame_shadow(Gfx::FrameShadow::Sunken); set_frame_thickness(2); m_form_widget = FormWidget::construct(*this); diff --git a/DevTools/HackStudio/Locator.cpp b/DevTools/HackStudio/Locator.cpp index 847146da31c737..87ad26cbaa01d1 100644 --- a/DevTools/HackStudio/Locator.cpp +++ b/DevTools/HackStudio/Locator.cpp @@ -33,9 +33,9 @@ extern RefPtr g_project; extern void open_file(const String&); -static RefPtr s_file_icon; -static RefPtr s_cplusplus_icon; -static RefPtr s_header_icon; +static RefPtr s_file_icon; +static RefPtr s_cplusplus_icon; +static RefPtr s_header_icon; class LocatorSuggestionModel final : public GUI::Model { public: @@ -102,9 +102,9 @@ Locator::Locator(GUI::Widget* parent) : GUI::Widget(parent) { if (!s_cplusplus_icon) { - s_file_icon = GraphicsBitmap::load_from_file("/res/icons/16x16/filetype-unknown.png"); - s_cplusplus_icon = GraphicsBitmap::load_from_file("/res/icons/16x16/filetype-cplusplus.png"); - s_header_icon = GraphicsBitmap::load_from_file("/res/icons/16x16/filetype-header.png"); + s_file_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-unknown.png"); + s_cplusplus_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-cplusplus.png"); + s_header_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-header.png"); } set_layout(make()); diff --git a/DevTools/HackStudio/ProcessStateWidget.cpp b/DevTools/HackStudio/ProcessStateWidget.cpp index 6f7f2ab8204813..41df94450b970f 100644 --- a/DevTools/HackStudio/ProcessStateWidget.cpp +++ b/DevTools/HackStudio/ProcessStateWidget.cpp @@ -41,20 +41,20 @@ ProcessStateWidget::ProcessStateWidget(GUI::Widget* parent) set_layout(make()); auto pid_label_label = GUI::Label::construct("Process:", this); - pid_label_label->set_font(Font::default_bold_font()); + pid_label_label->set_font(Gfx::Font::default_bold_font()); m_pid_label = GUI::Label::construct("", this); auto state_label_label = GUI::Label::construct("State:", this); - state_label_label->set_font(Font::default_bold_font()); + state_label_label->set_font(Gfx::Font::default_bold_font()); m_state_label = GUI::Label::construct("", this); // FIXME: This should show CPU% instead. auto cpu_label_label = GUI::Label::construct("Times scheduled:", this); - cpu_label_label->set_font(Font::default_bold_font()); + cpu_label_label->set_font(Gfx::Font::default_bold_font()); m_cpu_label = GUI::Label::construct("", this); auto memory_label_label = GUI::Label::construct("Memory (resident):", this); - memory_label_label->set_font(Font::default_bold_font()); + memory_label_label->set_font(Gfx::Font::default_bold_font()); m_memory_label = GUI::Label::construct("", this); m_timer = Core::Timer::construct(500, [this] { diff --git a/DevTools/HackStudio/Project.cpp b/DevTools/HackStudio/Project.cpp index 13af7936b241da..a83a81d1f2c520 100644 --- a/DevTools/HackStudio/Project.cpp +++ b/DevTools/HackStudio/Project.cpp @@ -117,7 +117,7 @@ class ProjectModel final : public GUI::Model { if (role == Role::Font) { extern String g_currently_open_file; if (node->name == g_currently_open_file) - return Font::default_bold_font(); + return Gfx::Font::default_bold_font(); return {}; } return {}; @@ -169,11 +169,11 @@ Project::Project(const String& path, Vector&& filenames) { m_name = FileSystemPath(m_path).basename(); - m_file_icon = GIcon(GraphicsBitmap::load_from_file("/res/icons/16x16/filetype-unknown.png")); - m_cplusplus_icon = GIcon(GraphicsBitmap::load_from_file("/res/icons/16x16/filetype-cplusplus.png")); - m_header_icon = GIcon(GraphicsBitmap::load_from_file("/res/icons/16x16/filetype-header.png")); - m_directory_icon = GIcon(GraphicsBitmap::load_from_file("/res/icons/16x16/filetype-folder.png")); - m_project_icon = GIcon(GraphicsBitmap::load_from_file("/res/icons/16x16/app-hack-studio.png")); + m_file_icon = GIcon(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-unknown.png")); + m_cplusplus_icon = GIcon(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-cplusplus.png")); + m_header_icon = GIcon(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-header.png")); + m_directory_icon = GIcon(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-folder.png")); + m_project_icon = GIcon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-hack-studio.png")); for (auto& filename : filenames) { m_files.append(ProjectFile::construct_with_name(filename)); diff --git a/DevTools/HackStudio/WidgetTreeModel.cpp b/DevTools/HackStudio/WidgetTreeModel.cpp index be87bd67d14cea..4eb52582fcfecf 100644 --- a/DevTools/HackStudio/WidgetTreeModel.cpp +++ b/DevTools/HackStudio/WidgetTreeModel.cpp @@ -32,7 +32,7 @@ WidgetTreeModel::WidgetTreeModel(GUI::Widget& root) : m_root(root) { - m_widget_icon.set_bitmap_for_size(16, GraphicsBitmap::load_from_file("/res/icons/16x16/inspector-object.png")); + m_widget_icon.set_bitmap_for_size(16, Gfx::Bitmap::load_from_file("/res/icons/16x16/inspector-object.png")); } WidgetTreeModel::~WidgetTreeModel() diff --git a/DevTools/HackStudio/main.cpp b/DevTools/HackStudio/main.cpp index 84b7a77f74f5be..71da528cf0e49c 100644 --- a/DevTools/HackStudio/main.cpp +++ b/DevTools/HackStudio/main.cpp @@ -175,7 +175,7 @@ int main(int argc, char** argv) return files; }; - auto new_action = GUI::Action::create("Add new file to project...", { Mod_Ctrl, Key_N }, GraphicsBitmap::load_from_file("/res/icons/16x16/new.png"), [&](const GUI::Action&) { + auto new_action = GUI::Action::create("Add new file to project...", { Mod_Ctrl, Key_N }, Gfx::Bitmap::load_from_file("/res/icons/16x16/new.png"), [&](const GUI::Action&) { auto input_box = GUI::InputBox::construct("Enter name of new file:", "Add new file to project", g_window); if (input_box->exec() == GUI::InputBox::ExecCancel) return; @@ -193,7 +193,7 @@ int main(int argc, char** argv) open_file(filename); }); - auto add_existing_file_action = GUI::Action::create("Add existing file to project...", GraphicsBitmap::load_from_file("/res/icons/16x16/open.png"), [&](auto&) { + auto add_existing_file_action = GUI::Action::create("Add existing file to project...", Gfx::Bitmap::load_from_file("/res/icons/16x16/open.png"), [&](auto&) { auto result = GUI::FilePicker::get_open_filepath("Add existing file to project"); if (!result.has_value()) return; @@ -273,7 +273,7 @@ int main(int argc, char** argv) GUI::ActionGroup tool_actions; tool_actions.set_exclusive(true); - auto cursor_tool_action = GUI::Action::create("Cursor", GraphicsBitmap::load_from_file("/res/icons/widgets/Cursor.png"), [&](auto&) { + auto cursor_tool_action = GUI::Action::create("Cursor", Gfx::Bitmap::load_from_file("/res/icons/widgets/Cursor.png"), [&](auto&) { g_form_editor_widget->set_tool(make(*g_form_editor_widget)); }); cursor_tool_action->set_checkable(true); @@ -284,7 +284,7 @@ int main(int argc, char** argv) GUI::WidgetClassRegistration::for_each([&](const GUI::WidgetClassRegistration& reg) { auto icon_path = String::format("/res/icons/widgets/%s.png", reg.class_name().characters()); - auto action = GUI::Action::create(reg.class_name(), GraphicsBitmap::load_from_file(icon_path), [®](auto&) { + auto action = GUI::Action::create(reg.class_name(), Gfx::Bitmap::load_from_file(icon_path), [®](auto&) { g_form_editor_widget->set_tool(make(*g_form_editor_widget, reg)); auto widget = reg.construct(&g_form_editor_widget->form_widget()); widget->set_relative_rect(30, 30, 30, 30); @@ -310,8 +310,8 @@ int main(int argc, char** argv) wrapper->set_layout(make()); auto label = GUI::Label::construct(text, wrapper); label->set_fill_with_background_color(true); - label->set_text_alignment(TextAlignment::CenterLeft); - label->set_font(Font::default_bold_font()); + label->set_text_alignment(Gfx::TextAlignment::CenterLeft); + label->set_font(Gfx::Font::default_bold_font()); label->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); label->set_preferred_size(0, 16); wrapper->add_child(pane_widget); @@ -395,7 +395,7 @@ int main(int argc, char** argv) update_actions(); }); - auto save_action = GUI::Action::create("Save", { Mod_Ctrl, Key_S }, GraphicsBitmap::load_from_file("/res/icons/16x16/save.png"), [&](auto&) { + auto save_action = GUI::Action::create("Save", { Mod_Ctrl, Key_S }, Gfx::Bitmap::load_from_file("/res/icons/16x16/save.png"), [&](auto&) { if (g_currently_open_file.is_empty()) return; current_editor().write_to_file(g_currently_open_file); @@ -476,7 +476,7 @@ int main(int argc, char** argv) })); menubar->add_menu(move(edit_menu)); - auto stop_action = GUI::Action::create("Stop", GraphicsBitmap::load_from_file("/res/icons/16x16/stop.png"), [&](auto&) { + auto stop_action = GUI::Action::create("Stop", Gfx::Bitmap::load_from_file("/res/icons/16x16/stop.png"), [&](auto&) { terminal_wrapper->kill_running_command(); }); @@ -485,14 +485,14 @@ int main(int argc, char** argv) stop_action->set_enabled(false); }; - auto build_action = GUI::Action::create("Build", { Mod_Ctrl, Key_B }, GraphicsBitmap::load_from_file("/res/icons/16x16/build.png"), [&](auto&) { + auto build_action = GUI::Action::create("Build", { Mod_Ctrl, Key_B }, Gfx::Bitmap::load_from_file("/res/icons/16x16/build.png"), [&](auto&) { reveal_action_tab(terminal_wrapper); build(terminal_wrapper); stop_action->set_enabled(true); }); toolbar->add_action(build_action); - auto run_action = GUI::Action::create("Run", { Mod_Ctrl, Key_R }, GraphicsBitmap::load_from_file("/res/icons/16x16/play.png"), [&](auto&) { + auto run_action = GUI::Action::create("Run", { Mod_Ctrl, Key_R }, Gfx::Bitmap::load_from_file("/res/icons/16x16/play.png"), [&](auto&) { reveal_action_tab(terminal_wrapper); run(terminal_wrapper); stop_action->set_enabled(true); @@ -514,7 +514,7 @@ int main(int argc, char** argv) view_menu->add_action(remove_current_editor_action); menubar->add_menu(move(view_menu)); - auto small_icon = GraphicsBitmap::load_from_file("/res/icons/16x16/app-hack-studio.png"); + auto small_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/app-hack-studio.png"); auto help_menu = GUI::Menu::construct("Help"); help_menu->add_action(GUI::Action::create("About", [&](auto&) { @@ -550,16 +550,16 @@ void run(TerminalWrapper& wrapper) struct TextStyle { Color color; - const Font* font { nullptr }; + const Gfx::Font* font { nullptr }; }; static TextStyle style_for_token_type(CppToken::Type type) { switch (type) { case CppToken::Type::Keyword: - return { Color::Black, &Font::default_bold_fixed_width_font() }; + return { Color::Black, &Gfx::Font::default_bold_fixed_width_font() }; case CppToken::Type::KnownType: - return { Color::from_rgb(0x929200), &Font::default_bold_fixed_width_font() }; + return { Color::from_rgb(0x929200), &Gfx::Font::default_bold_fixed_width_font() }; case CppToken::Type::Identifier: return { Color::from_rgb(0x000092) }; case CppToken::Type::DoubleQuotedString: diff --git a/DevTools/IPCCompiler/main.cpp b/DevTools/IPCCompiler/main.cpp index f7bf82957b4779..2b1995c941a49c 100644 --- a/DevTools/IPCCompiler/main.cpp +++ b/DevTools/IPCCompiler/main.cpp @@ -327,7 +327,7 @@ int main(int argc, char** argv) } else if (parameter.type == "Color") { dbg() << " u32 " << parameter.name << "_rgba = 0;"; dbg() << " stream >> " << parameter.name << "_rgba;"; - dbg() << " " << parameter.name << " = Color::from_rgba(" << parameter.name << "_rgba);"; + dbg() << " " << parameter.name << " = Gfx::Color::from_rgba(" << parameter.name << "_rgba);"; } else if (parameter.type == "Size") { dbg() << " int " << parameter.name << "_width = 0;"; dbg() << " stream >> " << parameter.name << "_width;"; diff --git a/DevTools/Inspector/RemoteObjectGraphModel.cpp b/DevTools/Inspector/RemoteObjectGraphModel.cpp index 28a989f54d2bf5..3321183b981b9a 100644 --- a/DevTools/Inspector/RemoteObjectGraphModel.cpp +++ b/DevTools/Inspector/RemoteObjectGraphModel.cpp @@ -36,8 +36,8 @@ RemoteObjectGraphModel::RemoteObjectGraphModel(RemoteProcess& process) : m_process(process) { - m_object_icon.set_bitmap_for_size(16, load_png("/res/icons/16x16/inspector-object.png")); - m_window_icon.set_bitmap_for_size(16, load_png("/res/icons/16x16/window.png")); + m_object_icon.set_bitmap_for_size(16, Gfx::load_png("/res/icons/16x16/inspector-object.png")); + m_window_icon.set_bitmap_for_size(16, Gfx::load_png("/res/icons/16x16/window.png")); } RemoteObjectGraphModel::~RemoteObjectGraphModel() diff --git a/DevTools/ProfileViewer/ProfileModel.cpp b/DevTools/ProfileViewer/ProfileModel.cpp index ba2b0f99cbe5d4..27fe98cb02b5e6 100644 --- a/DevTools/ProfileViewer/ProfileModel.cpp +++ b/DevTools/ProfileViewer/ProfileModel.cpp @@ -33,8 +33,8 @@ ProfileModel::ProfileModel(Profile& profile) : m_profile(profile) { - m_user_frame_icon.set_bitmap_for_size(16, GraphicsBitmap::load_from_file("/res/icons/16x16/inspector-object.png")); - m_kernel_frame_icon.set_bitmap_for_size(16, GraphicsBitmap::load_from_file("/res/icons/16x16/inspector-object-red.png")); + m_user_frame_icon.set_bitmap_for_size(16, Gfx::Bitmap::load_from_file("/res/icons/16x16/inspector-object.png")); + m_kernel_frame_icon.set_bitmap_for_size(16, Gfx::Bitmap::load_from_file("/res/icons/16x16/inspector-object-red.png")); } ProfileModel::~ProfileModel() @@ -109,7 +109,7 @@ String ProfileModel::column_name(int column) const GUI::Model::ColumnMetadata ProfileModel::column_metadata(int column) const { if (column == Column::SampleCount) - return ColumnMetadata { 0, TextAlignment::CenterRight }; + return ColumnMetadata { 0, Gfx::TextAlignment::CenterRight }; return {}; } diff --git a/DevTools/ProfileViewer/ProfileTimelineWidget.cpp b/DevTools/ProfileViewer/ProfileTimelineWidget.cpp index 4132217dc3d839..852bd842567110 100644 --- a/DevTools/ProfileViewer/ProfileTimelineWidget.cpp +++ b/DevTools/ProfileViewer/ProfileTimelineWidget.cpp @@ -33,8 +33,8 @@ ProfileTimelineWidget::ProfileTimelineWidget(Profile& profile, GUI::Widget* pare , m_profile(profile) { set_frame_thickness(2); - set_frame_shadow(FrameShadow::Sunken); - set_frame_shape(FrameShape::Container); + set_frame_shadow(Gfx::FrameShadow::Sunken); + set_frame_shape(Gfx::FrameShape::Container); set_background_color(Color::White); set_fill_with_background_color(true); set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); diff --git a/DevTools/VisualBuilder/VBForm.cpp b/DevTools/VisualBuilder/VBForm.cpp index 5f88b4b446e014..00fa9d04d71ed2 100644 --- a/DevTools/VisualBuilder/VBForm.cpp +++ b/DevTools/VisualBuilder/VBForm.cpp @@ -63,13 +63,13 @@ VBForm::VBForm(const String& name, GUI::Widget* parent) widget->gwidget()->move_to_back(); })); m_context_menu->add_separator(); - m_context_menu->add_action(GUI::Action::create("Lay out horizontally", load_png("/res/icons/16x16/layout-horizontally.png"), [this](auto&) { + m_context_menu->add_action(GUI::Action::create("Lay out horizontally", Gfx::load_png("/res/icons/16x16/layout-horizontally.png"), [this](auto&) { if (auto* widget = single_selected_widget()) { dbg() << "Giving " << *widget->gwidget() << " a horizontal box layout"; widget->gwidget()->set_layout(make()); } })); - m_context_menu->add_action(GUI::Action::create("Lay out vertically", load_png("/res/icons/16x16/layout-vertically.png"), [this](auto&) { + m_context_menu->add_action(GUI::Action::create("Lay out vertically", Gfx::load_png("/res/icons/16x16/layout-vertically.png"), [this](auto&) { if (auto* widget = single_selected_widget()) { dbg() << "Giving " << *widget->gwidget() << " a vertical box layout"; widget->gwidget()->set_layout(make()); @@ -138,7 +138,7 @@ bool VBForm::is_selected(const VBWidget& widget) const return m_selected_widgets.contains(const_cast(&widget)); } -VBWidget* VBForm::widget_at(const Point& position) +VBWidget* VBForm::widget_at(const Gfx::Point& position) { auto result = hit_test(position, GUI::Widget::ShouldRespectGreediness::No); if (!result.widget) diff --git a/DevTools/VisualBuilder/VBForm.h b/DevTools/VisualBuilder/VBForm.h index 4b49908fbb68c4..dba01dbe12ef21 100644 --- a/DevTools/VisualBuilder/VBForm.h +++ b/DevTools/VisualBuilder/VBForm.h @@ -43,7 +43,7 @@ class VBForm : public GUI::Widget { void set_name(const String& name) { m_name = name; } bool is_selected(const VBWidget&) const; - VBWidget* widget_at(const Point&); + VBWidget* widget_at(const Gfx::Point&); void set_should_snap_to_grip(bool snap) { m_should_snap_to_grid = snap; } bool should_snap_to_grid() const { return m_should_snap_to_grid; } @@ -83,8 +83,8 @@ class VBForm : public GUI::Widget { NonnullRefPtrVector m_widgets; HashMap m_gwidget_map; HashTable m_selected_widgets; - Point m_transform_event_origin; - Point m_next_insertion_position; + Gfx::Point m_transform_event_origin; + Gfx::Point m_next_insertion_position; Direction m_resize_direction { Direction::None }; Direction m_mouse_direction_type { Direction::None }; RefPtr m_context_menu; diff --git a/DevTools/VisualBuilder/VBWidget.cpp b/DevTools/VisualBuilder/VBWidget.cpp index 3cac9cc6da7f43..93cce9648b80b7 100644 --- a/DevTools/VisualBuilder/VBWidget.cpp +++ b/DevTools/VisualBuilder/VBWidget.cpp @@ -64,7 +64,7 @@ Rect VBWidget::rect() const return m_gwidget->window_relative_rect(); } -void VBWidget::set_rect(const Rect& rect) +void VBWidget::set_rect(const Gfx::Rect& rect) { if (rect == m_gwidget->window_relative_rect()) return; @@ -106,7 +106,7 @@ Rect VBWidget::grabber_rect(Direction direction) const } } -Direction VBWidget::grabber_at(const Point& position) const +Direction VBWidget::grabber_at(const Gfx::Point& position) const { Direction found_grabber = Direction::None; for_each_direction([&](Direction direction) { diff --git a/DevTools/VisualBuilder/VBWidget.h b/DevTools/VisualBuilder/VBWidget.h index 11870161871b95..48bee7f478ff6b 100644 --- a/DevTools/VisualBuilder/VBWidget.h +++ b/DevTools/VisualBuilder/VBWidget.h @@ -80,10 +80,10 @@ class VBWidget : public RefCounted bool is_selected() const; Rect rect() const; - void set_rect(const Rect&); + void set_rect(const Gfx::Rect&); Rect grabber_rect(Direction) const; - Direction grabber_at(const Point&) const; + Direction grabber_at(const Gfx::Point&) const; GUI::Widget* gwidget() { return m_gwidget; } @@ -113,5 +113,5 @@ class VBWidget : public RefCounted RefPtr m_gwidget; NonnullOwnPtrVector m_properties; NonnullRefPtr m_property_model; - Rect m_transform_origin_rect; + Gfx::Rect m_transform_origin_rect; }; diff --git a/DevTools/VisualBuilder/VBWidgetPropertyModel.cpp b/DevTools/VisualBuilder/VBWidgetPropertyModel.cpp index 4f366ceff5e13e..8acb441694b4c7 100644 --- a/DevTools/VisualBuilder/VBWidgetPropertyModel.cpp +++ b/DevTools/VisualBuilder/VBWidgetPropertyModel.cpp @@ -61,8 +61,8 @@ GUI::Model::ColumnMetadata VBWidgetPropertyModel::column_metadata(int column) co { UNUSED_PARAM(column); if (column == Column::Name) - return { 110, TextAlignment::CenterLeft, &Font::default_bold_font() }; - return { 90, TextAlignment::CenterLeft }; + return { 110, Gfx::TextAlignment::CenterLeft, &Gfx::Font::default_bold_font() }; + return { 90, Gfx::TextAlignment::CenterLeft }; } GUI::Variant VBWidgetPropertyModel::data(const GUI::ModelIndex& index, Role role) const diff --git a/DevTools/VisualBuilder/main.cpp b/DevTools/VisualBuilder/main.cpp index 10d707dee8c460..421de868afee94 100644 --- a/DevTools/VisualBuilder/main.cpp +++ b/DevTools/VisualBuilder/main.cpp @@ -82,7 +82,7 @@ int main(int argc, char** argv) auto help_menu = GUI::Menu::construct("Help"); help_menu->add_action(GUI::Action::create("About", [&](const GUI::Action&) { - GUI::AboutDialog::show("Visual Builder", load_png("/res/icons/32x32/app-visual-builder.png"), window); + GUI::AboutDialog::show("Visual Builder", Gfx::load_png("/res/icons/32x32/app-visual-builder.png"), window); })); menubar->add_menu(move(help_menu)); @@ -113,82 +113,82 @@ RefPtr make_toolbox_window() window->set_main_widget(widget); auto label_button = GUI::Button::construct(widget); - label_button->set_button_style(ButtonStyle::CoolBar); + label_button->set_button_style(Gfx::ButtonStyle::CoolBar); label_button->set_tooltip("GLabel"); - label_button->set_icon(GraphicsBitmap::load_from_file("/res/icons/vbwidgets/label.png")); + label_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/label.png")); label_button->on_click = [](GUI::Button&) { if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GLabel); }; auto button_button = GUI::Button::construct(widget); - button_button->set_button_style(ButtonStyle::CoolBar); + button_button->set_button_style(Gfx::ButtonStyle::CoolBar); button_button->set_tooltip("GButton"); - button_button->set_icon(GraphicsBitmap::load_from_file("/res/icons/vbwidgets/button.png")); + button_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/button.png")); button_button->on_click = [](GUI::Button&) { if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GButton); }; auto spinbox_button = GUI::Button::construct(widget); - spinbox_button->set_button_style(ButtonStyle::CoolBar); + spinbox_button->set_button_style(Gfx::ButtonStyle::CoolBar); spinbox_button->set_tooltip("GSpinBox"); - spinbox_button->set_icon(GraphicsBitmap::load_from_file("/res/icons/vbwidgets/spinbox.png")); + spinbox_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/spinbox.png")); spinbox_button->on_click = [](GUI::Button&) { if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GSpinBox); }; auto editor_button = GUI::Button::construct(widget); - editor_button->set_button_style(ButtonStyle::CoolBar); + editor_button->set_button_style(Gfx::ButtonStyle::CoolBar); editor_button->set_tooltip("GTextEditor"); - editor_button->set_icon(GraphicsBitmap::load_from_file("/res/icons/vbwidgets/textbox.png")); + editor_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/textbox.png")); editor_button->on_click = [](GUI::Button&) { if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GTextEditor); }; auto progress_bar_button = GUI::Button::construct(widget); - progress_bar_button->set_button_style(ButtonStyle::CoolBar); + progress_bar_button->set_button_style(Gfx::ButtonStyle::CoolBar); progress_bar_button->set_tooltip("GProgressBar"); - progress_bar_button->set_icon(GraphicsBitmap::load_from_file("/res/icons/vbwidgets/progressbar.png")); + progress_bar_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/progressbar.png")); progress_bar_button->on_click = [](GUI::Button&) { if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GProgressBar); }; auto slider_button = GUI::Button::construct(widget); - slider_button->set_button_style(ButtonStyle::CoolBar); + slider_button->set_button_style(Gfx::ButtonStyle::CoolBar); slider_button->set_tooltip("GSlider"); - slider_button->set_icon(GraphicsBitmap::load_from_file("/res/icons/vbwidgets/slider.png")); + slider_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/slider.png")); slider_button->on_click = [](GUI::Button&) { if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GSlider); }; auto checkbox_button = GUI::Button::construct(widget); - checkbox_button->set_button_style(ButtonStyle::CoolBar); + checkbox_button->set_button_style(Gfx::ButtonStyle::CoolBar); checkbox_button->set_tooltip("GCheckBox"); - checkbox_button->set_icon(GraphicsBitmap::load_from_file("/res/icons/vbwidgets/checkbox.png")); + checkbox_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/checkbox.png")); checkbox_button->on_click = [](GUI::Button&) { if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GCheckBox); }; auto radiobutton_button = GUI::Button::construct(widget); - radiobutton_button->set_button_style(ButtonStyle::CoolBar); + radiobutton_button->set_button_style(Gfx::ButtonStyle::CoolBar); radiobutton_button->set_tooltip("GRadioButton"); - radiobutton_button->set_icon(GraphicsBitmap::load_from_file("/res/icons/filled-radio-circle.png")); + radiobutton_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/filled-radio-circle.png")); radiobutton_button->on_click = [](GUI::Button&) { if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GRadioButton); }; auto scrollbar_button = GUI::Button::construct(widget); - scrollbar_button->set_button_style(ButtonStyle::CoolBar); + scrollbar_button->set_button_style(Gfx::ButtonStyle::CoolBar); scrollbar_button->set_tooltip("GScrollBar"); - scrollbar_button->set_icon(GraphicsBitmap::load_from_file("/res/icons/vbwidgets/scrollbar.png")); + scrollbar_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/scrollbar.png")); scrollbar_button->on_click = [](GUI::Button&) { if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GScrollBar); }; auto groupbox_button = GUI::Button::construct(widget); - groupbox_button->set_button_style(ButtonStyle::CoolBar); + groupbox_button->set_button_style(Gfx::ButtonStyle::CoolBar); groupbox_button->set_tooltip("GGroupBox"); - groupbox_button->set_icon(GraphicsBitmap::load_from_file("/res/icons/vbwidgets/groupbox.png")); + groupbox_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/groupbox.png")); groupbox_button->on_click = [](GUI::Button&) { if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GGroupBox); diff --git a/Games/Minesweeper/Field.cpp b/Games/Minesweeper/Field.cpp index ef8074250a01f1..7f4039bc283c8b 100644 --- a/Games/Minesweeper/Field.cpp +++ b/Games/Minesweeper/Field.cpp @@ -134,17 +134,17 @@ Field::Field(GUI::Label& flag_label, GUI::Label& time_label, GUI::Button& face_b }; m_timer->set_interval(100); set_frame_thickness(2); - set_frame_shape(FrameShape::Container); - set_frame_shadow(FrameShadow::Sunken); - m_mine_bitmap = GraphicsBitmap::load_from_file("/res/icons/minesweeper/mine.png"); - m_flag_bitmap = GraphicsBitmap::load_from_file("/res/icons/minesweeper/flag.png"); - m_badflag_bitmap = GraphicsBitmap::load_from_file("/res/icons/minesweeper/badflag.png"); - m_consider_bitmap = GraphicsBitmap::load_from_file("/res/icons/minesweeper/consider.png"); - m_default_face_bitmap = GraphicsBitmap::load_from_file("/res/icons/minesweeper/face-default.png"); - m_good_face_bitmap = GraphicsBitmap::load_from_file("/res/icons/minesweeper/face-good.png"); - m_bad_face_bitmap = GraphicsBitmap::load_from_file("/res/icons/minesweeper/face-bad.png"); + set_frame_shape(Gfx::FrameShape::Container); + set_frame_shadow(Gfx::FrameShadow::Sunken); + m_mine_bitmap = Gfx::Bitmap::load_from_file("/res/icons/minesweeper/mine.png"); + m_flag_bitmap = Gfx::Bitmap::load_from_file("/res/icons/minesweeper/flag.png"); + m_badflag_bitmap = Gfx::Bitmap::load_from_file("/res/icons/minesweeper/badflag.png"); + m_consider_bitmap = Gfx::Bitmap::load_from_file("/res/icons/minesweeper/consider.png"); + m_default_face_bitmap = Gfx::Bitmap::load_from_file("/res/icons/minesweeper/face-default.png"); + m_good_face_bitmap = Gfx::Bitmap::load_from_file("/res/icons/minesweeper/face-good.png"); + m_bad_face_bitmap = Gfx::Bitmap::load_from_file("/res/icons/minesweeper/face-bad.png"); for (int i = 0; i < 8; ++i) - m_number_bitmap[i] = GraphicsBitmap::load_from_file(String::format("/res/icons/minesweeper/%u.png", i + 1)); + m_number_bitmap[i] = Gfx::Bitmap::load_from_file(String::format("/res/icons/minesweeper/%u.png", i + 1)); set_fill_with_background_color(true); reset(); diff --git a/Games/Minesweeper/Field.h b/Games/Minesweeper/Field.h index 7aa0b26fd344f5..5d99b0e3ec4b5e 100644 --- a/Games/Minesweeper/Field.h +++ b/Games/Minesweeper/Field.h @@ -113,14 +113,14 @@ class Field final : public GUI::Frame { int m_mine_count { 0 }; int m_unswept_empties { 0 }; Vector> m_squares; - RefPtr m_mine_bitmap; - RefPtr m_flag_bitmap; - RefPtr m_badflag_bitmap; - RefPtr m_consider_bitmap; - RefPtr m_default_face_bitmap; - RefPtr m_good_face_bitmap; - RefPtr m_bad_face_bitmap; - RefPtr m_number_bitmap[8]; + RefPtr m_mine_bitmap; + RefPtr m_flag_bitmap; + RefPtr m_badflag_bitmap; + RefPtr m_consider_bitmap; + RefPtr m_default_face_bitmap; + RefPtr m_good_face_bitmap; + RefPtr m_bad_face_bitmap; + RefPtr m_number_bitmap[8]; GUI::Button& m_face_button; GUI::Label& m_flag_label; GUI::Label& m_time_label; diff --git a/Games/Minesweeper/main.cpp b/Games/Minesweeper/main.cpp index 58bfc99ac7583d..657be40720a5a8 100644 --- a/Games/Minesweeper/main.cpp +++ b/Games/Minesweeper/main.cpp @@ -69,14 +69,14 @@ int main(int argc, char** argv) container->set_preferred_size(0, 36); container->set_layout(make()); auto flag_icon_label = GUI::Label::construct(container); - flag_icon_label->set_icon(GraphicsBitmap::load_from_file("/res/icons/minesweeper/flag.png")); + flag_icon_label->set_icon(Gfx::Bitmap::load_from_file("/res/icons/minesweeper/flag.png")); auto flag_label = GUI::Label::construct(container); auto face_button = GUI::Button::construct(container); - face_button->set_button_style(ButtonStyle::CoolBar); + face_button->set_button_style(Gfx::ButtonStyle::CoolBar); face_button->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); face_button->set_preferred_size(36, 0); auto time_icon_label = GUI::Label::construct(container); - time_icon_label->set_icon(GraphicsBitmap::load_from_file("/res/icons/minesweeper/timer.png")); + time_icon_label->set_icon(Gfx::Bitmap::load_from_file("/res/icons/minesweeper/timer.png")); auto time_label = GUI::Label::construct(container); auto field = Field::construct(*flag_label, *time_label, *face_button, widget, [&](Size size) { size.set_height(size.height() + container->preferred_size().height()); @@ -129,7 +129,7 @@ int main(int argc, char** argv) auto help_menu = GUI::Menu::construct("Help"); help_menu->add_action(GUI::Action::create("About", [&](const GUI::Action&) { - GUI::AboutDialog::show("Minesweeper", load_png("/res/icons/32x32/app-minesweeper.png"), window); + GUI::AboutDialog::show("Minesweeper", Gfx::load_png("/res/icons/32x32/app-minesweeper.png"), window); })); menubar->add_menu(move(help_menu)); @@ -137,7 +137,7 @@ int main(int argc, char** argv) window->show(); - window->set_icon(load_png("/res/icons/minesweeper/mine.png")); + window->set_icon(Gfx::load_png("/res/icons/minesweeper/mine.png")); return app.exec(); } diff --git a/Games/Snake/SnakeGame.cpp b/Games/Snake/SnakeGame.cpp index 98a0acd403729f..2eed90cf6c290d 100644 --- a/Games/Snake/SnakeGame.cpp +++ b/Games/Snake/SnakeGame.cpp @@ -35,10 +35,10 @@ SnakeGame::SnakeGame(GUI::Widget* parent) : GUI::Widget(parent) { set_font(GFontDatabase::the().get_by_name("Liza Regular")); - m_fruit_bitmaps.append(*GraphicsBitmap::load_from_file("/res/icons/snake/paprika.png")); - m_fruit_bitmaps.append(*GraphicsBitmap::load_from_file("/res/icons/snake/eggplant.png")); - m_fruit_bitmaps.append(*GraphicsBitmap::load_from_file("/res/icons/snake/cauliflower.png")); - m_fruit_bitmaps.append(*GraphicsBitmap::load_from_file("/res/icons/snake/tomato.png")); + m_fruit_bitmaps.append(*Gfx::Bitmap::load_from_file("/res/icons/snake/paprika.png")); + m_fruit_bitmaps.append(*Gfx::Bitmap::load_from_file("/res/icons/snake/eggplant.png")); + m_fruit_bitmaps.append(*Gfx::Bitmap::load_from_file("/res/icons/snake/cauliflower.png")); + m_fruit_bitmaps.append(*Gfx::Bitmap::load_from_file("/res/icons/snake/tomato.png")); srand(time(nullptr)); reset(); @@ -228,8 +228,8 @@ void SnakeGame::paint_event(GUI::PaintEvent& event) painter.draw_scaled_bitmap(cell_rect(m_fruit), m_fruit_bitmaps[m_fruit_type], m_fruit_bitmaps[m_fruit_type].rect()); - painter.draw_text(high_score_rect(), m_high_score_text, TextAlignment::TopLeft, Color::from_rgb(0xfafae0)); - painter.draw_text(score_rect(), m_score_text, TextAlignment::TopLeft, Color::White); + painter.draw_text(high_score_rect(), m_high_score_text, Gfx::TextAlignment::TopLeft, Color::from_rgb(0xfafae0)); + painter.draw_text(score_rect(), m_score_text, Gfx::TextAlignment::TopLeft, Color::White); } void SnakeGame::game_over() diff --git a/Games/Snake/SnakeGame.h b/Games/Snake/SnakeGame.h index 69df7d5c0e9eea..3cc2a40f506005 100644 --- a/Games/Snake/SnakeGame.h +++ b/Games/Snake/SnakeGame.h @@ -87,5 +87,5 @@ class SnakeGame : public GUI::Widget { unsigned m_high_score { 0 }; String m_high_score_text; - NonnullRefPtrVector m_fruit_bitmaps; + NonnullRefPtrVector m_fruit_bitmaps; }; diff --git a/Games/Snake/main.cpp b/Games/Snake/main.cpp index d9293f16fa9011..191c12ff9b01e5 100644 --- a/Games/Snake/main.cpp +++ b/Games/Snake/main.cpp @@ -74,7 +74,7 @@ int main(int argc, char** argv) auto help_menu = GUI::Menu::construct("Help"); help_menu->add_action(GUI::Action::create("About", [&](const GUI::Action&) { - GUI::AboutDialog::show("Snake", load_png("/res/icons/32x32/app-snake.png"), window); + GUI::AboutDialog::show("Snake", Gfx::load_png("/res/icons/32x32/app-snake.png"), window); })); menubar->add_menu(move(help_menu)); @@ -82,7 +82,7 @@ int main(int argc, char** argv) window->show(); - window->set_icon(load_png("/res/icons/16x16/app-snake.png")); + window->set_icon(Gfx::load_png("/res/icons/16x16/app-snake.png")); return app.exec(); } diff --git a/Libraries/LibDraw/CharacterBitmap.cpp b/Libraries/LibDraw/CharacterBitmap.cpp index 2f4c4d588088f1..d51ff1d080b3fb 100644 --- a/Libraries/LibDraw/CharacterBitmap.cpp +++ b/Libraries/LibDraw/CharacterBitmap.cpp @@ -26,6 +26,8 @@ #include "CharacterBitmap.h" +namespace Gfx { + CharacterBitmap::CharacterBitmap(const char* ascii_data, unsigned width, unsigned height) : m_bits(ascii_data) , m_size(width, height) @@ -40,3 +42,5 @@ NonnullRefPtr CharacterBitmap::create_from_ascii(const char* as { return adopt(*new CharacterBitmap(asciiData, width, height)); } + +} diff --git a/Libraries/LibDraw/CharacterBitmap.h b/Libraries/LibDraw/CharacterBitmap.h index ac7bc7b06b1129..0a77d123afa9ec 100644 --- a/Libraries/LibDraw/CharacterBitmap.h +++ b/Libraries/LibDraw/CharacterBitmap.h @@ -27,8 +27,10 @@ #pragma once #include "Size.h" -#include #include +#include + +namespace Gfx { class CharacterBitmap : public RefCounted { public: @@ -48,3 +50,5 @@ class CharacterBitmap : public RefCounted { const char* m_bits { nullptr }; Size m_size; }; + +} diff --git a/Libraries/LibDraw/Color.h b/Libraries/LibDraw/Color.h index e851a4bbdd0d74..395ffa41493d25 100644 --- a/Libraries/LibDraw/Color.h +++ b/Libraries/LibDraw/Color.h @@ -30,6 +30,8 @@ #include #include +namespace Gfx { + enum class ColorRole; typedef u32 RGBA32; @@ -177,3 +179,7 @@ inline const LogStream& operator<<(const LogStream& stream, Color value) { return stream << value.to_string(); } + +} + +using Gfx::Color; diff --git a/Libraries/LibDraw/DisjointRectSet.cpp b/Libraries/LibDraw/DisjointRectSet.cpp index ef94b436fea37b..af47224f74858f 100644 --- a/Libraries/LibDraw/DisjointRectSet.cpp +++ b/Libraries/LibDraw/DisjointRectSet.cpp @@ -26,6 +26,8 @@ #include +namespace Gfx { + void DisjointRectSet::add(const Rect& new_rect) { for (auto& rect : m_rects) { @@ -69,3 +71,5 @@ void DisjointRectSet::shatter() swap(output, m_rects); } while (pass_had_intersections); } + +} diff --git a/Libraries/LibDraw/DisjointRectSet.h b/Libraries/LibDraw/DisjointRectSet.h index f0eb5d9761e393..9a36abb43e1bf8 100644 --- a/Libraries/LibDraw/DisjointRectSet.h +++ b/Libraries/LibDraw/DisjointRectSet.h @@ -29,6 +29,8 @@ #include #include +namespace Gfx { + class DisjointRectSet { public: DisjointRectSet() {} @@ -52,3 +54,5 @@ class DisjointRectSet { Vector m_rects; }; + +} diff --git a/Libraries/LibDraw/Emoji.cpp b/Libraries/LibDraw/Emoji.cpp index 43f341b639a377..fe8b7e9339ca87 100644 --- a/Libraries/LibDraw/Emoji.cpp +++ b/Libraries/LibDraw/Emoji.cpp @@ -29,9 +29,11 @@ #include #include -static HashMap> s_emojis; +namespace Gfx { -const GraphicsBitmap* Emoji::emoji_for_codepoint(u32 codepoint) +static HashMap> s_emojis; + +const Bitmap* Emoji::emoji_for_codepoint(u32 codepoint) { auto it = s_emojis.find(codepoint); if (it != s_emojis.end()) @@ -39,7 +41,7 @@ const GraphicsBitmap* Emoji::emoji_for_codepoint(u32 codepoint) String path = String::format("/res/emoji/U+%X.png", codepoint); - auto bitmap = GraphicsBitmap::load_from_file(path); + auto bitmap = Bitmap::load_from_file(path); if (!bitmap) { s_emojis.set(codepoint, nullptr); return nullptr; @@ -48,3 +50,5 @@ const GraphicsBitmap* Emoji::emoji_for_codepoint(u32 codepoint) s_emojis.set(codepoint, bitmap); return bitmap.ptr(); } + +} diff --git a/Libraries/LibDraw/Emoji.h b/Libraries/LibDraw/Emoji.h index a8257f08e58490..094f2050d7892d 100644 --- a/Libraries/LibDraw/Emoji.h +++ b/Libraries/LibDraw/Emoji.h @@ -28,9 +28,13 @@ #include -class GraphicsBitmap; +namespace Gfx { + +class Bitmap; class Emoji { public: - static const GraphicsBitmap* emoji_for_codepoint(u32 codepoint); + static const Gfx::Bitmap* emoji_for_codepoint(u32 codepoint); }; + +} diff --git a/Libraries/LibDraw/FloatPoint.h b/Libraries/LibDraw/FloatPoint.h index ecd3fb0f7642ee..05f16c7cfc4e28 100644 --- a/Libraries/LibDraw/FloatPoint.h +++ b/Libraries/LibDraw/FloatPoint.h @@ -26,10 +26,12 @@ #pragma once -#include #include +#include #include +namespace Gfx { + class FloatRect; class FloatPoint { @@ -141,3 +143,7 @@ inline const LogStream& operator<<(const LogStream& stream, const FloatPoint& va { return stream << value.to_string(); } + +} + +using Gfx::FloatPoint; diff --git a/Libraries/LibDraw/FloatRect.h b/Libraries/LibDraw/FloatRect.h index 5fd4cf43ed5a85..91ec03eee145a0 100644 --- a/Libraries/LibDraw/FloatRect.h +++ b/Libraries/LibDraw/FloatRect.h @@ -35,6 +35,8 @@ #include #include +namespace Gfx { + class FloatRect { public: FloatRect() {} @@ -324,3 +326,7 @@ inline Rect enclosing_int_rect(const FloatRect& float_rect) { return { (int)float_rect.x(), (int)float_rect.y(), (int)ceilf(float_rect.width()), (int)ceilf(float_rect.height()) }; } + +} + +using Gfx::FloatRect; diff --git a/Libraries/LibDraw/FloatSize.h b/Libraries/LibDraw/FloatSize.h index f8ae8bc4d549c6..08376a5fc25ce3 100644 --- a/Libraries/LibDraw/FloatSize.h +++ b/Libraries/LibDraw/FloatSize.h @@ -26,10 +26,12 @@ #pragma once -#include #include +#include #include +namespace Gfx { + class FloatSize { public: FloatSize() {} @@ -111,3 +113,7 @@ inline const LogStream& operator<<(const LogStream& stream, const FloatSize& val { return stream << value.to_string(); } + +} + +using Gfx::FloatSize; diff --git a/Libraries/LibDraw/Font.cpp b/Libraries/LibDraw/Font.cpp index fc1c65e4f813a6..d8ea3127930c66 100644 --- a/Libraries/LibDraw/Font.cpp +++ b/Libraries/LibDraw/Font.cpp @@ -25,18 +25,20 @@ */ #include "Font.h" +#include "Emoji.h" +#include "GraphicsBitmap.h" #include #include #include +#include #include #include #include -#include #include +#include #include -#include -#include "Emoji.h" -#include "GraphicsBitmap.h" + +namespace Gfx { struct [[gnu::packed]] FontFileHeader { @@ -236,3 +238,5 @@ int Font::width(const Utf8View& utf8) const return width; } + +} diff --git a/Libraries/LibDraw/Font.h b/Libraries/LibDraw/Font.h index 84d39bdbba290a..b164582e849a54 100644 --- a/Libraries/LibDraw/Font.h +++ b/Libraries/LibDraw/Font.h @@ -26,13 +26,15 @@ #pragma once -#include #include -#include #include +#include +#include #include -#include #include +#include + +namespace Gfx { // FIXME: Make a MutableGlyphBitmap buddy class for FontEditor instead? class GlyphBitmap { @@ -126,3 +128,5 @@ class Font : public RefCounted { bool m_fixed_width { false }; }; + +} diff --git a/Libraries/LibDraw/GIFLoader.cpp b/Libraries/LibDraw/GIFLoader.cpp index afb80f650ef63a..2ef4ea59e8c006 100644 --- a/Libraries/LibDraw/GIFLoader.cpp +++ b/Libraries/LibDraw/GIFLoader.cpp @@ -31,9 +31,11 @@ #include #include -static RefPtr load_gif_impl(const u8*, size_t); +namespace Gfx { -RefPtr load_gif(const StringView& path) +static RefPtr load_gif_impl(const u8*, size_t); + +RefPtr load_gif(const StringView& path) { MappedFile mapped_file(path); if (!mapped_file.is_valid()) @@ -44,7 +46,7 @@ RefPtr load_gif(const StringView& path) return bitmap; } -RefPtr load_gif_from_memory(const u8* data, size_t length) +RefPtr load_gif_from_memory(const u8* data, size_t length) { auto bitmap = load_gif_impl(data, length); if (bitmap) @@ -80,7 +82,7 @@ struct ImageDescriptor { Vector lzw_encoded_bytes; }; -RefPtr load_gif_impl(const u8* data, size_t data_size) +RefPtr load_gif_impl(const u8* data, size_t data_size) { if (data_size < 32) return nullptr; @@ -259,3 +261,5 @@ RefPtr load_gif_impl(const u8* data, size_t data_size) return nullptr; } + +} diff --git a/Libraries/LibDraw/GIFLoader.h b/Libraries/LibDraw/GIFLoader.h index 4360f5b7ffd415..06be29aa4be981 100644 --- a/Libraries/LibDraw/GIFLoader.h +++ b/Libraries/LibDraw/GIFLoader.h @@ -29,8 +29,10 @@ #include #include -RefPtr load_gif(const StringView& path); -RefPtr load_gif_from_memory(const u8*, size_t); +namespace Gfx { + +RefPtr load_gif(const StringView& path); +RefPtr load_gif_from_memory(const u8*, size_t); struct GIFLoadingContext; @@ -40,10 +42,12 @@ class GIFImageDecoderPlugin final : public ImageDecoderPlugin { GIFImageDecoderPlugin(const u8*, size_t); virtual Size size() override; - virtual RefPtr bitmap() override; + virtual RefPtr bitmap() override; virtual void set_volatile() override; [[nodiscard]] virtual bool set_nonvolatile() override; private: OwnPtr m_context; }; + +} diff --git a/Libraries/LibDraw/GraphicsBitmap.cpp b/Libraries/LibDraw/GraphicsBitmap.cpp index 0d06ee222b2cc0..7b5e00dd2b8e88 100644 --- a/Libraries/LibDraw/GraphicsBitmap.cpp +++ b/Libraries/LibDraw/GraphicsBitmap.cpp @@ -33,17 +33,19 @@ #include #include -NonnullRefPtr GraphicsBitmap::create(Format format, const Size& size) +namespace Gfx { + +NonnullRefPtr Bitmap::create(Format format, const Size& size) { - return adopt(*new GraphicsBitmap(format, size, Purgeable::No)); + return adopt(*new Bitmap(format, size, Purgeable::No)); } -NonnullRefPtr GraphicsBitmap::create_purgeable(Format format, const Size& size) +NonnullRefPtr Bitmap::create_purgeable(Format format, const Size& size) { - return adopt(*new GraphicsBitmap(format, size, Purgeable::Yes)); + return adopt(*new Bitmap(format, size, Purgeable::Yes)); } -GraphicsBitmap::GraphicsBitmap(Format format, const Size& size, Purgeable purgeable) +Bitmap::Bitmap(Format format, const Size& size, Purgeable purgeable) : m_size(size) , m_pitch(round_up_to_power_of_two(size.width() * sizeof(RGBA32), 16)) , m_format(format) @@ -57,25 +59,25 @@ GraphicsBitmap::GraphicsBitmap(Format format, const Size& size, Purgeable purgea m_needs_munmap = true; } -NonnullRefPtr GraphicsBitmap::create_wrapper(Format format, const Size& size, size_t pitch, RGBA32* data) +NonnullRefPtr Bitmap::create_wrapper(Format format, const Size& size, size_t pitch, RGBA32* data) { - return adopt(*new GraphicsBitmap(format, size, pitch, data)); + return adopt(*new Bitmap(format, size, pitch, data)); } -RefPtr GraphicsBitmap::load_from_file(const StringView& path) +RefPtr Bitmap::load_from_file(const StringView& path) { return load_png(path); } -RefPtr GraphicsBitmap::load_from_file(Format format, const StringView& path, const Size& size) +RefPtr Bitmap::load_from_file(Format format, const StringView& path, const Size& size) { MappedFile mapped_file(path); if (!mapped_file.is_valid()) return nullptr; - return adopt(*new GraphicsBitmap(format, size, move(mapped_file))); + return adopt(*new Bitmap(format, size, move(mapped_file))); } -GraphicsBitmap::GraphicsBitmap(Format format, const Size& size, size_t pitch, RGBA32* data) +Bitmap::Bitmap(Format format, const Size& size, size_t pitch, RGBA32* data) : m_size(size) , m_data(data) , m_pitch(pitch) @@ -85,7 +87,7 @@ GraphicsBitmap::GraphicsBitmap(Format format, const Size& size, size_t pitch, RG m_palette = new RGBA32[256]; } -GraphicsBitmap::GraphicsBitmap(Format format, const Size& size, MappedFile&& mapped_file) +Bitmap::Bitmap(Format format, const Size& size, MappedFile&& mapped_file) : m_size(size) , m_data((RGBA32*)mapped_file.data()) , m_pitch(round_up_to_power_of_two(size.width() * sizeof(RGBA32), 16)) @@ -95,12 +97,12 @@ GraphicsBitmap::GraphicsBitmap(Format format, const Size& size, MappedFile&& map ASSERT(format != Format::Indexed8); } -NonnullRefPtr GraphicsBitmap::create_with_shared_buffer(Format format, NonnullRefPtr&& shared_buffer, const Size& size) +NonnullRefPtr Bitmap::create_with_shared_buffer(Format format, NonnullRefPtr&& shared_buffer, const Size& size) { - return adopt(*new GraphicsBitmap(format, move(shared_buffer), size)); + return adopt(*new Bitmap(format, move(shared_buffer), size)); } -GraphicsBitmap::GraphicsBitmap(Format format, NonnullRefPtr&& shared_buffer, const Size& size) +Bitmap::Bitmap(Format format, NonnullRefPtr&& shared_buffer, const Size& size) : m_size(size) , m_data((RGBA32*)shared_buffer->data()) , m_pitch(round_up_to_power_of_two(size.width() * sizeof(RGBA32), 16)) @@ -110,17 +112,17 @@ GraphicsBitmap::GraphicsBitmap(Format format, NonnullRefPtr&& shar ASSERT(format != Format::Indexed8); } -NonnullRefPtr GraphicsBitmap::to_shareable_bitmap() const +NonnullRefPtr Bitmap::to_shareable_bitmap() const { if (m_shared_buffer) return *this; auto buffer = SharedBuffer::create_with_size(size_in_bytes()); - auto bitmap = GraphicsBitmap::create_with_shared_buffer(m_format, *buffer, m_size); + auto bitmap = Bitmap::create_with_shared_buffer(m_format, *buffer, m_size); memcpy(buffer->data(), scanline(0), size_in_bytes()); return bitmap; } -GraphicsBitmap::~GraphicsBitmap() +Bitmap::~Bitmap() { if (m_needs_munmap) { int rc = munmap(m_data, size_in_bytes()); @@ -130,22 +132,22 @@ GraphicsBitmap::~GraphicsBitmap() delete[] m_palette; } -void GraphicsBitmap::set_mmap_name(const StringView& name) +void Bitmap::set_mmap_name(const StringView& name) { ASSERT(m_needs_munmap); ::set_mmap_name(m_data, size_in_bytes(), String(name).characters()); } -void GraphicsBitmap::fill(Color color) +void Bitmap::fill(Color color) { - ASSERT(m_format == GraphicsBitmap::Format::RGB32 || m_format == GraphicsBitmap::Format::RGBA32); + ASSERT(m_format == Bitmap::Format::RGB32 || m_format == Bitmap::Format::RGBA32); for (int y = 0; y < height(); ++y) { auto* scanline = this->scanline(y); fast_u32_fill(scanline, color.value(), width()); } } -void GraphicsBitmap::set_volatile() +void Bitmap::set_volatile() { ASSERT(m_purgeable); if (m_volatile) @@ -158,7 +160,7 @@ void GraphicsBitmap::set_volatile() m_volatile = true; } -[[nodiscard]] bool GraphicsBitmap::set_nonvolatile() +[[nodiscard]] bool Bitmap::set_nonvolatile() { ASSERT(m_purgeable); if (!m_volatile) @@ -171,3 +173,5 @@ void GraphicsBitmap::set_volatile() m_volatile = false; return rc == 0; } + +} diff --git a/Libraries/LibDraw/GraphicsBitmap.h b/Libraries/LibDraw/GraphicsBitmap.h index dd3ce8805c68b0..7c64eafd1b22d1 100644 --- a/Libraries/LibDraw/GraphicsBitmap.h +++ b/Libraries/LibDraw/GraphicsBitmap.h @@ -36,7 +36,9 @@ #include #include -class GraphicsBitmap : public RefCounted { +namespace Gfx { + +class Bitmap : public RefCounted { public: enum class Format { Invalid, @@ -45,16 +47,16 @@ class GraphicsBitmap : public RefCounted { Indexed8 }; - static NonnullRefPtr create(Format, const Size&); - static NonnullRefPtr create_purgeable(Format, const Size&); - static NonnullRefPtr create_wrapper(Format, const Size&, size_t pitch, RGBA32*); - static RefPtr load_from_file(const StringView& path); - static RefPtr load_from_file(Format, const StringView& path, const Size&); - static NonnullRefPtr create_with_shared_buffer(Format, NonnullRefPtr&&, const Size&); + static NonnullRefPtr create(Format, const Size&); + static NonnullRefPtr create_purgeable(Format, const Size&); + static NonnullRefPtr create_wrapper(Format, const Size&, size_t pitch, RGBA32*); + static RefPtr load_from_file(const StringView& path); + static RefPtr load_from_file(Format, const StringView& path, const Size&); + static NonnullRefPtr create_with_shared_buffer(Format, NonnullRefPtr&&, const Size&); - NonnullRefPtr to_shareable_bitmap() const; + NonnullRefPtr to_shareable_bitmap() const; - ~GraphicsBitmap(); + ~Bitmap(); RGBA32* scanline(int y); const RGBA32* scanline(int y) const; @@ -137,10 +139,10 @@ class GraphicsBitmap : public RefCounted { private: enum class Purgeable { No, Yes }; - GraphicsBitmap(Format, const Size&, Purgeable); - GraphicsBitmap(Format, const Size&, size_t pitch, RGBA32*); - GraphicsBitmap(Format, const Size&, MappedFile&&); - GraphicsBitmap(Format, NonnullRefPtr&&, const Size&); + Bitmap(Format, const Size&, Purgeable); + Bitmap(Format, const Size&, size_t pitch, RGBA32*); + Bitmap(Format, const Size&, MappedFile&&); + Bitmap(Format, NonnullRefPtr&&, const Size&); Size m_size; RGBA32* m_data { nullptr }; @@ -154,45 +156,45 @@ class GraphicsBitmap : public RefCounted { RefPtr m_shared_buffer; }; -inline RGBA32* GraphicsBitmap::scanline(int y) +inline RGBA32* Bitmap::scanline(int y) { return reinterpret_cast((((u8*)m_data) + (y * m_pitch))); } -inline const RGBA32* GraphicsBitmap::scanline(int y) const +inline const RGBA32* Bitmap::scanline(int y) const { return reinterpret_cast((((const u8*)m_data) + (y * m_pitch))); } -inline const u8* GraphicsBitmap::bits(int y) const +inline const u8* Bitmap::bits(int y) const { return reinterpret_cast(scanline(y)); } -inline u8* GraphicsBitmap::bits(int y) +inline u8* Bitmap::bits(int y) { return reinterpret_cast(scanline(y)); } template<> -inline Color GraphicsBitmap::get_pixel(int x, int y) const +inline Color Bitmap::get_pixel(int x, int y) const { return Color::from_rgb(scanline(y)[x]); } template<> -inline Color GraphicsBitmap::get_pixel(int x, int y) const +inline Color Bitmap::get_pixel(int x, int y) const { return Color::from_rgba(scanline(y)[x]); } template<> -inline Color GraphicsBitmap::get_pixel(int x, int y) const +inline Color Bitmap::get_pixel(int x, int y) const { return Color::from_rgba(m_palette[bits(y)[x]]); } -inline Color GraphicsBitmap::get_pixel(int x, int y) const +inline Color Bitmap::get_pixel(int x, int y) const { switch (m_format) { case Format::RGB32: @@ -208,18 +210,18 @@ inline Color GraphicsBitmap::get_pixel(int x, int y) const } template<> -inline void GraphicsBitmap::set_pixel(int x, int y, Color color) +inline void Bitmap::set_pixel(int x, int y, Color color) { scanline(y)[x] = color.value(); } template<> -inline void GraphicsBitmap::set_pixel(int x, int y, Color color) +inline void Bitmap::set_pixel(int x, int y, Color color) { scanline(y)[x] = color.value(); } -inline void GraphicsBitmap::set_pixel(int x, int y, Color color) +inline void Bitmap::set_pixel(int x, int y, Color color) { switch (m_format) { case Format::RGB32: @@ -234,3 +236,5 @@ inline void GraphicsBitmap::set_pixel(int x, int y, Color color) ASSERT_NOT_REACHED(); } } + +} diff --git a/Libraries/LibDraw/ImageDecoder.cpp b/Libraries/LibDraw/ImageDecoder.cpp index 0413783aadccea..aae0dbfa01b303 100644 --- a/Libraries/LibDraw/ImageDecoder.cpp +++ b/Libraries/LibDraw/ImageDecoder.cpp @@ -27,6 +27,8 @@ #include #include +namespace Gfx { + ImageDecoder::ImageDecoder(const u8* data, size_t size) { m_plugin = make(data, size); @@ -35,3 +37,4 @@ ImageDecoder::ImageDecoder(const u8* data, size_t size) ImageDecoder::~ImageDecoder() { } +} diff --git a/Libraries/LibDraw/ImageDecoder.h b/Libraries/LibDraw/ImageDecoder.h index 9feb29d15dbc2f..d00a90c4dda420 100644 --- a/Libraries/LibDraw/ImageDecoder.h +++ b/Libraries/LibDraw/ImageDecoder.h @@ -31,14 +31,16 @@ #include #include -class GraphicsBitmap; +namespace Gfx { + +class Bitmap; class ImageDecoderPlugin { public: virtual ~ImageDecoderPlugin() {} virtual Size size() = 0; - virtual RefPtr bitmap() = 0; + virtual RefPtr bitmap() = 0; virtual void set_volatile() = 0; [[nodiscard]] virtual bool set_nonvolatile() = 0; @@ -55,7 +57,7 @@ class ImageDecoder : public RefCounted { Size size() const { return m_plugin->size(); } int width() const { return size().width(); } int height() const { return size().height(); } - RefPtr bitmap() const { return m_plugin->bitmap(); } + RefPtr bitmap() const { return m_plugin->bitmap(); } void set_volatile() { m_plugin->set_volatile(); } [[nodiscard]] bool set_nonvolatile() { return m_plugin->set_nonvolatile(); } @@ -64,3 +66,5 @@ class ImageDecoder : public RefCounted { mutable OwnPtr m_plugin; }; + +} diff --git a/Libraries/LibDraw/Orientation.h b/Libraries/LibDraw/Orientation.h index 7fa33f70b516a0..e83af3f5304a65 100644 --- a/Libraries/LibDraw/Orientation.h +++ b/Libraries/LibDraw/Orientation.h @@ -26,7 +26,13 @@ #pragma once +namespace Gfx { + enum class Orientation { Horizontal, Vertical }; + +} + +using Gfx::Orientation; diff --git a/Libraries/LibDraw/PNGLoader.cpp b/Libraries/LibDraw/PNGLoader.cpp index 0cc73bbbc21930..68a9c585b87fbb 100644 --- a/Libraries/LibDraw/PNGLoader.cpp +++ b/Libraries/LibDraw/PNGLoader.cpp @@ -37,6 +37,8 @@ #include #include +namespace Gfx { + static const u8 png_header[8] = { 0x89, 'P', 'N', 'G', 13, 10, 26, 10 }; struct PNG_IHDR { @@ -109,7 +111,7 @@ struct PNGLoadingContext { bool has_seen_zlib_header { false }; bool has_alpha() const { return color_type & 4 || palette_transparency_data.size() > 0; } Vector scanlines; - RefPtr bitmap; + RefPtr bitmap; u8* decompression_buffer { nullptr }; int decompression_buffer_size { 0 }; Vector compressed_data; @@ -167,10 +169,10 @@ class Streamer { int m_size_remaining; }; -static RefPtr load_png_impl(const u8*, int); +static RefPtr load_png_impl(const u8*, int); static bool process_chunk(Streamer&, PNGLoadingContext& context, bool decode_size_only); -RefPtr load_png(const StringView& path) +RefPtr load_png(const StringView& path) { MappedFile mapped_file(path); if (!mapped_file.is_valid()) @@ -181,7 +183,7 @@ RefPtr load_png(const StringView& path) return bitmap; } -RefPtr load_png_from_memory(const u8* data, size_t length) +RefPtr load_png_from_memory(const u8* data, size_t length) { auto bitmap = load_png_impl(data, length); if (bitmap) @@ -216,7 +218,7 @@ union [[gnu::packed]] Pixel static_assert(sizeof(Pixel) == 4); template -[[gnu::always_inline]] static inline void unfilter_impl(GraphicsBitmap& bitmap, int y, const void* dummy_scanline_data) +[[gnu::always_inline]] static inline void unfilter_impl(Gfx::Bitmap& bitmap, int y, const void* dummy_scanline_data) { auto* dummy_scanline = (const Pixel*)dummy_scanline_data; if constexpr (filter_type == 0) { @@ -517,7 +519,7 @@ static bool decode_png_bitmap(PNGLoadingContext& context) } } - context.bitmap = GraphicsBitmap::create_purgeable(context.has_alpha() ? GraphicsBitmap::Format::RGBA32 : GraphicsBitmap::Format::RGB32, { context.width, context.height }); + context.bitmap = Bitmap::create_purgeable(context.has_alpha() ? Bitmap::Format::RGBA32 : Bitmap::Format::RGB32, { context.width, context.height }); unfilter(context); @@ -529,7 +531,7 @@ static bool decode_png_bitmap(PNGLoadingContext& context) return true; } -static RefPtr load_png_impl(const u8* data, int data_size) +static RefPtr load_png_impl(const u8* data, int data_size) { PNGLoadingContext context; context.data = data; @@ -687,7 +689,7 @@ Size PNGImageDecoderPlugin::size() return { m_context->width, m_context->height }; } -RefPtr PNGImageDecoderPlugin::bitmap() +RefPtr PNGImageDecoderPlugin::bitmap() { if (m_context->state == PNGLoadingContext::State::Error) return nullptr; @@ -715,3 +717,5 @@ bool PNGImageDecoderPlugin::set_nonvolatile() return false; return m_context->bitmap->set_nonvolatile(); } + +} diff --git a/Libraries/LibDraw/PNGLoader.h b/Libraries/LibDraw/PNGLoader.h index 37681977a48167..c3d5f8e3f89631 100644 --- a/Libraries/LibDraw/PNGLoader.h +++ b/Libraries/LibDraw/PNGLoader.h @@ -29,8 +29,10 @@ #include #include -RefPtr load_png(const StringView& path); -RefPtr load_png_from_memory(const u8*, size_t); +namespace Gfx { + +RefPtr load_png(const StringView& path); +RefPtr load_png_from_memory(const u8*, size_t); struct PNGLoadingContext; @@ -40,10 +42,12 @@ class PNGImageDecoderPlugin final : public ImageDecoderPlugin { PNGImageDecoderPlugin(const u8*, size_t); virtual Size size() override; - virtual RefPtr bitmap() override; + virtual RefPtr bitmap() override; virtual void set_volatile() override; [[nodiscard]] virtual bool set_nonvolatile() override; private: OwnPtr m_context; }; + +} diff --git a/Libraries/LibDraw/Painter.cpp b/Libraries/LibDraw/Painter.cpp index 1533f79c8fbfea..4cc8bbc42dcf05 100644 --- a/Libraries/LibDraw/Painter.cpp +++ b/Libraries/LibDraw/Painter.cpp @@ -49,19 +49,21 @@ #endif #endif -template -static ALWAYS_INLINE Color get_pixel(const GraphicsBitmap& bitmap, int x, int y) +namespace Gfx { + +template +static ALWAYS_INLINE Color get_pixel(const Gfx::Bitmap& bitmap, int x, int y) { - if constexpr (format == GraphicsBitmap::Format::Indexed8) + if constexpr (format == Bitmap::Format::Indexed8) return bitmap.palette_color(bitmap.bits(y)[x]); - if constexpr (format == GraphicsBitmap::Format::RGB32) + if constexpr (format == Bitmap::Format::RGB32) return Color::from_rgb(bitmap.scanline(y)[x]); - if constexpr (format == GraphicsBitmap::Format::RGBA32) + if constexpr (format == Bitmap::Format::RGBA32) return Color::from_rgba(bitmap.scanline(y)[x]); return bitmap.get_pixel(x, y); } -Painter::Painter(GraphicsBitmap& bitmap) +Painter::Painter(Gfx::Bitmap& bitmap) : m_target(bitmap) { m_state_stack.append(State()); @@ -286,7 +288,7 @@ void Painter::draw_bitmap(const Point& p, const GlyphBitmap& bitmap, Color color } } -void Painter::blit_scaled(const Rect& dst_rect_raw, const GraphicsBitmap& source, const Rect& src_rect, float hscale, float vscale) +void Painter::blit_scaled(const Rect& dst_rect_raw, const Gfx::Bitmap& source, const Rect& src_rect, float hscale, float vscale) { auto dst_rect = Rect(dst_rect_raw.location(), dst_rect_raw.size()).translated(translation()); auto clipped_rect = dst_rect.intersected(clip_rect()); @@ -316,7 +318,7 @@ void Painter::blit_scaled(const Rect& dst_rect_raw, const GraphicsBitmap& source return; } -void Painter::blit_with_opacity(const Point& position, const GraphicsBitmap& source, const Rect& src_rect, float opacity) +void Painter::blit_with_opacity(const Point& position, const Gfx::Bitmap& source, const Rect& src_rect, float opacity) { ASSERT(!m_target->has_alpha_channel()); @@ -354,7 +356,7 @@ void Painter::blit_with_opacity(const Point& position, const GraphicsBitmap& sou } } -void Painter::blit_dimmed(const Point& position, const GraphicsBitmap& source, const Rect& src_rect) +void Painter::blit_dimmed(const Point& position, const Gfx::Bitmap& source, const Rect& src_rect) { Rect safe_src_rect = src_rect.intersected(source.rect()); auto dst_rect = Rect(position, safe_src_rect.size()).translated(translation()); @@ -385,7 +387,7 @@ void Painter::blit_dimmed(const Point& position, const GraphicsBitmap& source, c } } -void Painter::draw_tiled_bitmap(const Rect& a_dst_rect, const GraphicsBitmap& source) +void Painter::draw_tiled_bitmap(const Rect& a_dst_rect, const Gfx::Bitmap& source) { auto dst_rect = a_dst_rect.translated(translation()); auto clipped_rect = dst_rect.intersected(clip_rect()); @@ -397,7 +399,7 @@ void Painter::draw_tiled_bitmap(const Rect& a_dst_rect, const GraphicsBitmap& so RGBA32* dst = m_target->scanline(clipped_rect.y()) + clipped_rect.x(); const size_t dst_skip = m_target->pitch() / sizeof(RGBA32); - if (source.format() == GraphicsBitmap::Format::RGB32 || source.format() == GraphicsBitmap::Format::RGBA32) { + if (source.format() == Bitmap::Format::RGB32 || source.format() == Bitmap::Format::RGBA32) { int x_start = first_column + a_dst_rect.left(); for (int row = first_row; row <= last_row; ++row) { const RGBA32* sl = source.scanline((row + a_dst_rect.top()) @@ -414,7 +416,7 @@ void Painter::draw_tiled_bitmap(const Rect& a_dst_rect, const GraphicsBitmap& so } void Painter::blit_offset(const Point& position, - const GraphicsBitmap& source, + const Gfx::Bitmap& source, const Rect& src_rect, const Point& offset) { @@ -428,7 +430,7 @@ void Painter::blit_offset(const Point& position, RGBA32* dst = m_target->scanline(clipped_rect.y()) + clipped_rect.x(); const size_t dst_skip = m_target->pitch() / sizeof(RGBA32); - if (source.format() == GraphicsBitmap::Format::RGB32 || source.format() == GraphicsBitmap::Format::RGBA32) { + if (source.format() == Bitmap::Format::RGB32 || source.format() == Bitmap::Format::RGBA32) { int x_start = first_column + src_rect.left(); for (int row = first_row; row <= last_row; ++row) { int sr = row - offset.y() + src_rect.top(); @@ -450,7 +452,7 @@ void Painter::blit_offset(const Point& position, ASSERT_NOT_REACHED(); } -void Painter::blit_with_alpha(const Point& position, const GraphicsBitmap& source, const Rect& src_rect) +void Painter::blit_with_alpha(const Point& position, const Gfx::Bitmap& source, const Rect& src_rect) { ASSERT(source.has_alpha_channel()); Rect safe_src_rect = src_rect.intersected(source.rect()); @@ -482,7 +484,7 @@ void Painter::blit_with_alpha(const Point& position, const GraphicsBitmap& sourc } } -void Painter::blit(const Point& position, const GraphicsBitmap& source, const Rect& src_rect, float opacity) +void Painter::blit(const Point& position, const Gfx::Bitmap& source, const Rect& src_rect, float opacity) { if (opacity < 1.0f) return blit_with_opacity(position, source, src_rect, opacity); @@ -500,7 +502,7 @@ void Painter::blit(const Point& position, const GraphicsBitmap& source, const Re RGBA32* dst = m_target->scanline(clipped_rect.y()) + clipped_rect.x(); const size_t dst_skip = m_target->pitch() / sizeof(RGBA32); - if (source.format() == GraphicsBitmap::Format::RGB32 || source.format() == GraphicsBitmap::Format::RGBA32) { + if (source.format() == Bitmap::Format::RGB32 || source.format() == Bitmap::Format::RGBA32) { const RGBA32* src = source.scanline(src_rect.top() + first_row) + src_rect.left() + first_column; const size_t src_skip = source.pitch() / sizeof(RGBA32); for (int row = first_row; row <= last_row; ++row) { @@ -511,7 +513,7 @@ void Painter::blit(const Point& position, const GraphicsBitmap& source, const Re return; } - if (source.format() == GraphicsBitmap::Format::Indexed8) { + if (source.format() == Bitmap::Format::Indexed8) { const u8* src = source.bits(src_rect.top() + first_row) + src_rect.left() + first_column; const size_t src_skip = source.pitch(); for (int row = first_row; row <= last_row; ++row) { @@ -527,7 +529,7 @@ void Painter::blit(const Point& position, const GraphicsBitmap& source, const Re } template -ALWAYS_INLINE static void do_draw_integer_scaled_bitmap(GraphicsBitmap& target, const Rect& dst_rect, const GraphicsBitmap& source, int hfactor, int vfactor, GetPixel get_pixel) +ALWAYS_INLINE static void do_draw_integer_scaled_bitmap(Gfx::Bitmap& target, const Rect& dst_rect, const Gfx::Bitmap& source, int hfactor, int vfactor, GetPixel get_pixel) { for (int y = source.rect().top(); y <= source.rect().bottom(); ++y) { int dst_y = dst_rect.y() + y * vfactor; @@ -548,7 +550,7 @@ ALWAYS_INLINE static void do_draw_integer_scaled_bitmap(GraphicsBitmap& target, } template -ALWAYS_INLINE static void do_draw_scaled_bitmap(GraphicsBitmap& target, const Rect& dst_rect, const Rect& clipped_rect, const GraphicsBitmap& source, const Rect& src_rect, int hscale, int vscale, GetPixel get_pixel) +ALWAYS_INLINE static void do_draw_scaled_bitmap(Gfx::Bitmap& target, const Rect& dst_rect, const Rect& clipped_rect, const Gfx::Bitmap& source, const Rect& src_rect, int hscale, int vscale, GetPixel get_pixel) { if (dst_rect == clipped_rect && !(dst_rect.width() % src_rect.width()) && !(dst_rect.height() % src_rect.height())) { int hfactor = dst_rect.width() / src_rect.width(); @@ -577,7 +579,7 @@ ALWAYS_INLINE static void do_draw_scaled_bitmap(GraphicsBitmap& target, const Re } } -void Painter::draw_scaled_bitmap(const Rect& a_dst_rect, const GraphicsBitmap& source, const Rect& src_rect) +void Painter::draw_scaled_bitmap(const Rect& a_dst_rect, const Gfx::Bitmap& source, const Rect& src_rect) { auto dst_rect = a_dst_rect; if (dst_rect.size() == src_rect.size()) @@ -595,32 +597,32 @@ void Painter::draw_scaled_bitmap(const Rect& a_dst_rect, const GraphicsBitmap& s if (source.has_alpha_channel()) { switch (source.format()) { - case GraphicsBitmap::Format::RGB32: - do_draw_scaled_bitmap(*m_target, dst_rect, clipped_rect, source, src_rect, hscale, vscale, get_pixel); + case Bitmap::Format::RGB32: + do_draw_scaled_bitmap(*m_target, dst_rect, clipped_rect, source, src_rect, hscale, vscale, get_pixel); break; - case GraphicsBitmap::Format::RGBA32: - do_draw_scaled_bitmap(*m_target, dst_rect, clipped_rect, source, src_rect, hscale, vscale, get_pixel); + case Bitmap::Format::RGBA32: + do_draw_scaled_bitmap(*m_target, dst_rect, clipped_rect, source, src_rect, hscale, vscale, get_pixel); break; - case GraphicsBitmap::Format::Indexed8: - do_draw_scaled_bitmap(*m_target, dst_rect, clipped_rect, source, src_rect, hscale, vscale, get_pixel); + case Bitmap::Format::Indexed8: + do_draw_scaled_bitmap(*m_target, dst_rect, clipped_rect, source, src_rect, hscale, vscale, get_pixel); break; default: - do_draw_scaled_bitmap(*m_target, dst_rect, clipped_rect, source, src_rect, hscale, vscale, get_pixel); + do_draw_scaled_bitmap(*m_target, dst_rect, clipped_rect, source, src_rect, hscale, vscale, get_pixel); break; } } else { switch (source.format()) { - case GraphicsBitmap::Format::RGB32: - do_draw_scaled_bitmap(*m_target, dst_rect, clipped_rect, source, src_rect, hscale, vscale, get_pixel); + case Bitmap::Format::RGB32: + do_draw_scaled_bitmap(*m_target, dst_rect, clipped_rect, source, src_rect, hscale, vscale, get_pixel); break; - case GraphicsBitmap::Format::RGBA32: - do_draw_scaled_bitmap(*m_target, dst_rect, clipped_rect, source, src_rect, hscale, vscale, get_pixel); + case Bitmap::Format::RGBA32: + do_draw_scaled_bitmap(*m_target, dst_rect, clipped_rect, source, src_rect, hscale, vscale, get_pixel); break; - case GraphicsBitmap::Format::Indexed8: - do_draw_scaled_bitmap(*m_target, dst_rect, clipped_rect, source, src_rect, hscale, vscale, get_pixel); + case Bitmap::Format::Indexed8: + do_draw_scaled_bitmap(*m_target, dst_rect, clipped_rect, source, src_rect, hscale, vscale, get_pixel); break; default: - do_draw_scaled_bitmap(*m_target, dst_rect, clipped_rect, source, src_rect, hscale, vscale, get_pixel); + do_draw_scaled_bitmap(*m_target, dst_rect, clipped_rect, source, src_rect, hscale, vscale, get_pixel); break; } } @@ -636,7 +638,7 @@ void Painter::draw_scaled_bitmap(const Rect& a_dst_rect, const GraphicsBitmap& s draw_bitmap(point, font.glyph_bitmap(ch), color); } -void Painter::draw_emoji(const Point& point, const GraphicsBitmap& emoji, const Font& font) +void Painter::draw_emoji(const Point& point, const Gfx::Bitmap& emoji, const Font& font) { if (!font.is_fixed_width()) blit(point, emoji, emoji.rect()); @@ -952,3 +954,5 @@ PainterStateSaver::~PainterStateSaver() { m_painter.restore(); } + +} diff --git a/Libraries/LibDraw/Painter.h b/Libraries/LibDraw/Painter.h index ade140241c9116..638ef9d30e1772 100644 --- a/Libraries/LibDraw/Painter.h +++ b/Libraries/LibDraw/Painter.h @@ -35,15 +35,17 @@ #include #include +namespace Gfx { + class CharacterBitmap; class GlyphBitmap; -class GraphicsBitmap; +class Bitmap; class Font; class Emoji; class Painter { public: - explicit Painter(GraphicsBitmap&); + explicit Painter(Gfx::Bitmap&); ~Painter(); void clear_rect(const Rect&, Color); void fill_rect(const Rect&, Color); @@ -54,17 +56,17 @@ class Painter { void draw_ellipse_intersecting(const Rect&, Color, int thickness = 1); void set_pixel(const Point&, Color); void draw_line(const Point&, const Point&, Color, int thickness = 1, bool dotted = false); - void draw_scaled_bitmap(const Rect& dst_rect, const GraphicsBitmap&, const Rect& src_rect); - void blit(const Point&, const GraphicsBitmap&, const Rect& src_rect, float opacity = 1.0f); - void blit_dimmed(const Point&, const GraphicsBitmap&, const Rect& src_rect); - void draw_tiled_bitmap(const Rect& dst_rect, const GraphicsBitmap&); - void blit_offset(const Point&, const GraphicsBitmap&, const Rect& src_rect, const Point&); - void blit_scaled(const Rect&, const GraphicsBitmap&, const Rect&, float, float); + void draw_scaled_bitmap(const Rect& dst_rect, const Gfx::Bitmap&, const Rect& src_rect); + void blit(const Point&, const Gfx::Bitmap&, const Rect& src_rect, float opacity = 1.0f); + void blit_dimmed(const Point&, const Gfx::Bitmap&, const Rect& src_rect); + void draw_tiled_bitmap(const Rect& dst_rect, const Gfx::Bitmap&); + void blit_offset(const Point&, const Gfx::Bitmap&, const Rect& src_rect, const Point&); + void blit_scaled(const Rect&, const Gfx::Bitmap&, const Rect&, float, float); void draw_text(const Rect&, const StringView&, const Font&, TextAlignment = TextAlignment::TopLeft, Color = Color::Black, TextElision = TextElision::None); void draw_text(const Rect&, const StringView&, TextAlignment = TextAlignment::TopLeft, Color = Color::Black, TextElision = TextElision::None); void draw_glyph(const Point&, char, Color); void draw_glyph(const Point&, char, const Font&, Color); - void draw_emoji(const Point&, const GraphicsBitmap&, const Font&); + void draw_emoji(const Point&, const Gfx::Bitmap&, const Font&); void draw_glyph_or_emoji(const Point&, u32 codepoint, const Font&, Color); const Font& font() const { return *state().font; } @@ -86,7 +88,7 @@ class Painter { Point translation() const { return state().translation; } - GraphicsBitmap* target() { return m_target.ptr(); } + Gfx::Bitmap* target() { return m_target.ptr(); } void save() { m_state_stack.append(m_state_stack.last()); } void restore() @@ -98,8 +100,8 @@ class Painter { protected: void set_pixel_with_draw_op(u32& pixel, const Color&); void fill_rect_with_draw_op(const Rect&, Color); - void blit_with_alpha(const Point&, const GraphicsBitmap&, const Rect& src_rect); - void blit_with_opacity(const Point&, const GraphicsBitmap&, const Rect& src_rect, float opacity); + void blit_with_alpha(const Point&, const Gfx::Bitmap&, const Rect& src_rect); + void blit_with_opacity(const Point&, const Gfx::Bitmap&, const Rect& src_rect, float opacity); void draw_pixel(const Point&, Color, int thickness = 1); void draw_text_line(const Rect&, const Utf8View&, const Font&, TextAlignment, Color, TextElision); @@ -115,7 +117,7 @@ class Painter { const State& state() const { return m_state_stack.last(); } Rect m_clip_origin; - NonnullRefPtr m_target; + NonnullRefPtr m_target; Vector m_state_stack; }; @@ -127,3 +129,5 @@ class PainterStateSaver { private: Painter& m_painter; }; + +} diff --git a/Libraries/LibDraw/Palette.cpp b/Libraries/LibDraw/Palette.cpp index 3356f12867e903..217c1c9bcfe737 100644 --- a/Libraries/LibDraw/Palette.cpp +++ b/Libraries/LibDraw/Palette.cpp @@ -26,6 +26,8 @@ #include +namespace Gfx { + NonnullRefPtr PaletteImpl::create_with_shared_buffer(SharedBuffer& buffer) { return adopt(*new PaletteImpl(buffer)); @@ -70,3 +72,5 @@ void Palette::set_color(ColorRole role, Color color) auto& theme = const_cast(impl().theme()); theme.color[(int)role] = color; } + +} diff --git a/Libraries/LibDraw/Palette.h b/Libraries/LibDraw/Palette.h index 5c18c1026346e6..8e05f32b5ae2c8 100644 --- a/Libraries/LibDraw/Palette.h +++ b/Libraries/LibDraw/Palette.h @@ -34,6 +34,8 @@ namespace GUI { class Application; } +namespace Gfx { + class PaletteImpl : public RefCounted { AK_MAKE_NONCOPYABLE(PaletteImpl) AK_MAKE_NONMOVABLE(PaletteImpl) @@ -107,3 +109,7 @@ class Palette { private: NonnullRefPtr m_impl; }; + +} + +using Gfx::Palette; diff --git a/Libraries/LibDraw/Point.h b/Libraries/LibDraw/Point.h index b3cc0a2d825c84..8bdd76efbdeb25 100644 --- a/Libraries/LibDraw/Point.h +++ b/Libraries/LibDraw/Point.h @@ -30,6 +30,8 @@ #include #include +namespace Gfx { + class Rect; class Point { @@ -158,3 +160,7 @@ inline const LogStream& operator<<(const LogStream& stream, const Point& value) { return stream << value.to_string(); } + +} + +using Gfx::Point; diff --git a/Libraries/LibDraw/Rect.h b/Libraries/LibDraw/Rect.h index 7acfab9a7b56b4..3e9a1d8bfcdd44 100644 --- a/Libraries/LibDraw/Rect.h +++ b/Libraries/LibDraw/Rect.h @@ -33,6 +33,8 @@ #include #include +namespace Gfx { + class Rect { public: Rect() {} @@ -329,3 +331,7 @@ inline const LogStream& operator<<(const LogStream& stream, const Rect& value) { return stream << value.to_string(); } + +} + +using Gfx::Rect; diff --git a/Libraries/LibDraw/Size.h b/Libraries/LibDraw/Size.h index 765b90f034c620..bc027617cad796 100644 --- a/Libraries/LibDraw/Size.h +++ b/Libraries/LibDraw/Size.h @@ -26,10 +26,12 @@ #pragma once -#include #include +#include #include +namespace Gfx { + class Size { public: Size() {} @@ -100,7 +102,6 @@ class Size { set_height(value); } - String to_string() const { return String::format("[%dx%d]", m_width, m_height); } private: @@ -112,3 +113,7 @@ inline const LogStream& operator<<(const LogStream& stream, const Size& value) { return stream << value.to_string(); } + +} + +using Gfx::Size; diff --git a/Libraries/LibDraw/StylePainter.cpp b/Libraries/LibDraw/StylePainter.cpp index 2d4198ad2178e5..a94715c3ddfedc 100644 --- a/Libraries/LibDraw/StylePainter.cpp +++ b/Libraries/LibDraw/StylePainter.cpp @@ -29,6 +29,8 @@ #include #include +namespace Gfx { + void StylePainter::paint_tab_button(Painter& painter, const Rect& rect, const Palette& palette, bool active, bool hovered, bool enabled) { Color base_color = palette.button(); @@ -285,12 +287,12 @@ void StylePainter::paint_progress_bar(Painter& painter, const Rect& rect, const painter.draw_text(rect.translated(0, 0), text, TextAlignment::Center, palette.base_text()); } -static RefPtr s_unfilled_circle_bitmap; -static RefPtr s_filled_circle_bitmap; -static RefPtr s_changing_filled_circle_bitmap; -static RefPtr s_changing_unfilled_circle_bitmap; +static RefPtr s_unfilled_circle_bitmap; +static RefPtr s_filled_circle_bitmap; +static RefPtr s_changing_filled_circle_bitmap; +static RefPtr s_changing_unfilled_circle_bitmap; -static const GraphicsBitmap& circle_bitmap(bool checked, bool changing) +static const Gfx::Bitmap& circle_bitmap(bool checked, bool changing) { if (changing) return checked ? *s_changing_filled_circle_bitmap : *s_changing_unfilled_circle_bitmap; @@ -300,12 +302,14 @@ static const GraphicsBitmap& circle_bitmap(bool checked, bool changing) void StylePainter::paint_radio_button(Painter& painter, const Rect& rect, const Palette&, bool is_checked, bool is_being_pressed) { if (!s_unfilled_circle_bitmap) { - s_unfilled_circle_bitmap = GraphicsBitmap::load_from_file("/res/icons/unfilled-radio-circle.png"); - s_filled_circle_bitmap = GraphicsBitmap::load_from_file("/res/icons/filled-radio-circle.png"); - s_changing_filled_circle_bitmap = GraphicsBitmap::load_from_file("/res/icons/changing-filled-radio-circle.png"); - s_changing_unfilled_circle_bitmap = GraphicsBitmap::load_from_file("/res/icons/changing-unfilled-radio-circle.png"); + 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"); } auto& bitmap = circle_bitmap(is_checked, is_being_pressed); painter.blit(rect.location(), bitmap, bitmap.rect()); } + +} diff --git a/Libraries/LibDraw/StylePainter.h b/Libraries/LibDraw/StylePainter.h index 28ba3719f54293..9fd7d415e73bdc 100644 --- a/Libraries/LibDraw/StylePainter.h +++ b/Libraries/LibDraw/StylePainter.h @@ -28,6 +28,8 @@ #include +namespace Gfx { + class Painter; class Palette; class Rect; @@ -60,3 +62,5 @@ class StylePainter { static void paint_progress_bar(Painter&, const Rect&, const Palette&, int min, int max, int value, const StringView& text = {}); static void paint_radio_button(Painter&, const Rect&, const Palette&, bool is_checked, bool is_being_pressed); }; + +} diff --git a/Libraries/LibDraw/SystemTheme.cpp b/Libraries/LibDraw/SystemTheme.cpp index 12538fb820170a..18b7922dfd94c0 100644 --- a/Libraries/LibDraw/SystemTheme.cpp +++ b/Libraries/LibDraw/SystemTheme.cpp @@ -27,6 +27,8 @@ #include #include +namespace Gfx { + static SystemTheme dummy_theme; static const SystemTheme* theme_page = &dummy_theme; static RefPtr theme_buffer; @@ -109,3 +111,5 @@ RefPtr load_system_theme(const String& path) return buffer; } + +} diff --git a/Libraries/LibDraw/SystemTheme.h b/Libraries/LibDraw/SystemTheme.h index 2e9bf4212bbe9f..a84afb92a17eb2 100644 --- a/Libraries/LibDraw/SystemTheme.h +++ b/Libraries/LibDraw/SystemTheme.h @@ -30,6 +30,8 @@ #include #include +namespace Gfx { + enum class ColorRole { NoRole, DesktopBackground, @@ -82,3 +84,7 @@ const SystemTheme& current_system_theme(); int current_system_theme_buffer_id(); void set_system_theme(SharedBuffer&); RefPtr load_system_theme(const String& path); + +} + +using Gfx::ColorRole; diff --git a/Libraries/LibDraw/TextAlignment.h b/Libraries/LibDraw/TextAlignment.h index e1a31572671fbb..4e527711b8ef18 100644 --- a/Libraries/LibDraw/TextAlignment.h +++ b/Libraries/LibDraw/TextAlignment.h @@ -26,6 +26,8 @@ #pragma once +namespace Gfx { + enum class TextAlignment { TopLeft, CenterLeft, @@ -44,3 +46,5 @@ inline bool is_right_text_alignment(TextAlignment alignment) return false; } } + +} diff --git a/Libraries/LibDraw/TextElision.h b/Libraries/LibDraw/TextElision.h index d4785214c5ff52..cf8cecc00133e7 100644 --- a/Libraries/LibDraw/TextElision.h +++ b/Libraries/LibDraw/TextElision.h @@ -26,7 +26,11 @@ #pragma once +namespace Gfx { + enum class TextElision { None, Right, }; + +} diff --git a/Libraries/LibDraw/Triangle.h b/Libraries/LibDraw/Triangle.h index 9afb7da1f63334..23aac1516e02db 100644 --- a/Libraries/LibDraw/Triangle.h +++ b/Libraries/LibDraw/Triangle.h @@ -26,6 +26,8 @@ #include +namespace Gfx { + class Triangle { public: Triangle(Point a, Point b, Point c) @@ -75,3 +77,5 @@ inline const LogStream& operator<<(const LogStream& stream, const Triangle& valu { return stream << value.to_string(); } + +} diff --git a/Libraries/LibGUI/GAboutDialog.cpp b/Libraries/LibGUI/GAboutDialog.cpp index 1de04024070f68..a8a586e8f3aa4b 100644 --- a/Libraries/LibGUI/GAboutDialog.cpp +++ b/Libraries/LibGUI/GAboutDialog.cpp @@ -32,7 +32,7 @@ namespace GUI { -AboutDialog::AboutDialog(const StringView& name, const GraphicsBitmap* icon, Core::Object* parent) +AboutDialog::AboutDialog(const StringView& name, const Gfx::Bitmap* icon, Core::Object* parent) : Dialog(parent) , m_name(name) , m_icon(icon) @@ -62,11 +62,11 @@ AboutDialog::AboutDialog(const StringView& name, const GraphicsBitmap* icon, Cor auto make_label = [&](const StringView& text, bool bold = false) { auto label = Label::construct(text, right_container); - label->set_text_alignment(TextAlignment::CenterLeft); + label->set_text_alignment(Gfx::TextAlignment::CenterLeft); label->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed); label->set_preferred_size(0, 14); if (bold) - label->set_font(Font::default_bold_font()); + label->set_font(Gfx::Font::default_bold_font()); }; make_label(m_name, true); make_label("SerenityOS"); diff --git a/Libraries/LibGUI/GAboutDialog.h b/Libraries/LibGUI/GAboutDialog.h index 601ca95bc3a3d1..2a6947c367af2b 100644 --- a/Libraries/LibGUI/GAboutDialog.h +++ b/Libraries/LibGUI/GAboutDialog.h @@ -35,16 +35,16 @@ class AboutDialog final : public Dialog { public: virtual ~AboutDialog() override; - static void show(const StringView& name, const GraphicsBitmap* icon = nullptr, Core::Object* parent = nullptr) + static void show(const StringView& name, const Gfx::Bitmap* icon = nullptr, Core::Object* parent = nullptr) { auto dialog = AboutDialog::construct(name, icon, parent); dialog->exec(); } private: - AboutDialog(const StringView& name, const GraphicsBitmap* icon = nullptr, Core::Object* parent = nullptr); + AboutDialog(const StringView& name, const Gfx::Bitmap* icon = nullptr, Core::Object* parent = nullptr); String m_name; - RefPtr m_icon; + RefPtr m_icon; }; } diff --git a/Libraries/LibGUI/GAbstractButton.cpp b/Libraries/LibGUI/GAbstractButton.cpp index 0196f2ee12ba66..aa15645fb32930 100644 --- a/Libraries/LibGUI/GAbstractButton.cpp +++ b/Libraries/LibGUI/GAbstractButton.cpp @@ -171,19 +171,19 @@ void AbstractButton::keydown_event(KeyEvent& event) Widget::keydown_event(event); } -void AbstractButton::paint_text(Painter& painter, const Rect& rect, const Font& font, TextAlignment text_alignment) +void AbstractButton::paint_text(Painter& painter, const Gfx::Rect& rect, const Gfx::Font& font, Gfx::TextAlignment text_alignment) { auto clipped_rect = rect.intersected(this->rect()); if (!is_enabled()) { - painter.draw_text(clipped_rect.translated(1, 1), text(), font, text_alignment, Color::White, TextElision::Right); - painter.draw_text(clipped_rect, text(), font, text_alignment, Color::from_rgb(0x808080), TextElision::Right); + painter.draw_text(clipped_rect.translated(1, 1), text(), font, text_alignment, Color::White, Gfx::TextElision::Right); + painter.draw_text(clipped_rect, text(), font, text_alignment, Color::from_rgb(0x808080), Gfx::TextElision::Right); return; } if (text().is_empty()) return; - painter.draw_text(clipped_rect, text(), font, text_alignment, palette().button_text(), TextElision::Right); + painter.draw_text(clipped_rect, text(), font, text_alignment, palette().button_text(), Gfx::TextElision::Right); if (is_focused()) painter.draw_rect(clipped_rect.inflated(6, 4), Color(140, 140, 140)); } diff --git a/Libraries/LibGUI/GAbstractButton.h b/Libraries/LibGUI/GAbstractButton.h index cb9885dde3a623..bc9abc829ec998 100644 --- a/Libraries/LibGUI/GAbstractButton.h +++ b/Libraries/LibGUI/GAbstractButton.h @@ -75,7 +75,7 @@ class AbstractButton : public Widget { virtual void leave_event(Core::Event&) override; virtual void change_event(Event&) override; - void paint_text(Painter&, const Rect&, const Font&, TextAlignment); + void paint_text(Painter&, const Gfx::Rect&, const Gfx::Font&, Gfx::TextAlignment); private: virtual bool is_abstract_button() const final { return true; } diff --git a/Libraries/LibGUI/GAbstractTableView.cpp b/Libraries/LibGUI/GAbstractTableView.cpp index 5ab6f3947bf0e0..3b29e49e486318 100644 --- a/Libraries/LibGUI/GAbstractTableView.cpp +++ b/Libraries/LibGUI/GAbstractTableView.cpp @@ -39,8 +39,8 @@ static const int minimum_column_width = 2; AbstractTableView::AbstractTableView(Widget* parent) : AbstractView(parent) { - set_frame_shape(FrameShape::Container); - set_frame_shadow(FrameShadow::Sunken); + set_frame_shape(Gfx::FrameShape::Container); + set_frame_shadow(Gfx::FrameShadow::Sunken); set_frame_thickness(2); set_should_hide_unnecessary_scrollbars(true); @@ -144,7 +144,7 @@ void AbstractTableView::paint_headers(Painter& painter) Rect cell_rect(x_offset, 0, column_width + horizontal_padding() * 2, header_height()); bool pressed = column_index == m_pressed_column_header_index && m_pressed_column_header_is_pressed; bool hovered = column_index == m_hovered_column_header_index && model()->column_metadata(column_index).sortable == Model::ColumnMetadata::Sortable::True; - StylePainter::paint_button(painter, cell_rect, palette(), ButtonStyle::Normal, pressed, hovered); + Gfx::StylePainter::paint_button(painter, cell_rect, palette(), Gfx::ButtonStyle::Normal, pressed, hovered); String text; if (is_key_column) { StringBuilder builder; @@ -161,7 +161,7 @@ void AbstractTableView::paint_headers(Painter& painter) auto text_rect = cell_rect.translated(horizontal_padding(), 0); if (pressed) text_rect.move_by(1, 1); - painter.draw_text(text_rect, text, header_font(), TextAlignment::CenterLeft, palette().button_text()); + painter.draw_text(text_rect, text, header_font(), Gfx::TextAlignment::CenterLeft, palette().button_text()); x_offset += column_width + horizontal_padding() * 2; } } @@ -205,9 +205,9 @@ Menu& AbstractTableView::ensure_header_context_menu() return *m_header_context_menu; } -const Font& AbstractTableView::header_font() +const Gfx::Font& AbstractTableView::header_font() { - return Font::default_bold_font(); + return Gfx::Font::default_bold_font(); } void AbstractTableView::set_cell_painting_delegate(int column, OwnPtr&& delegate) @@ -378,7 +378,7 @@ void AbstractTableView::mousedown_event(MouseEvent& event) AbstractView::mousedown_event(event); } -ModelIndex AbstractTableView::index_at_event_position(const Point& position, bool& is_toggle) const +ModelIndex AbstractTableView::index_at_event_position(const Gfx::Point& position, bool& is_toggle) const { is_toggle = false; if (!model()) @@ -398,7 +398,7 @@ ModelIndex AbstractTableView::index_at_event_position(const Point& position, boo return {}; } -ModelIndex AbstractTableView::index_at_event_position(const Point& position) const +ModelIndex AbstractTableView::index_at_event_position(const Gfx::Point& position) const { bool is_toggle; auto index = index_at_event_position(position, is_toggle); @@ -545,7 +545,7 @@ Rect AbstractTableView::row_rect(int item_index) const return { 0, header_height() + (item_index * item_height()), max(content_size().width(), width()), item_height() }; } -Point AbstractTableView::adjusted_position(const Point& position) const +Point AbstractTableView::adjusted_position(const Gfx::Point& position) const { return position.translated(horizontal_scrollbar().value() - frame_thickness(), vertical_scrollbar().value() - frame_thickness()); } diff --git a/Libraries/LibGUI/GAbstractTableView.h b/Libraries/LibGUI/GAbstractTableView.h index b728b3fb2b548e..3b01b099a8fce8 100644 --- a/Libraries/LibGUI/GAbstractTableView.h +++ b/Libraries/LibGUI/GAbstractTableView.h @@ -37,7 +37,7 @@ class TableCellPaintingDelegate { public: virtual ~TableCellPaintingDelegate() {} - virtual void paint(Painter&, const Rect&, const Palette&, const Model&, const ModelIndex&) = 0; + virtual void paint(Painter&, const Gfx::Rect&, const Palette&, const Model&, const ModelIndex&) = 0; }; class AbstractTableView : public AbstractView { @@ -62,7 +62,7 @@ class AbstractTableView : public AbstractView { int horizontal_padding() const { return m_horizontal_padding; } - Point adjusted_position(const Point&) const; + Point adjusted_position(const Gfx::Point&) const; virtual Rect content_rect(const ModelIndex&) const override; Rect content_rect(int row, int column) const; @@ -70,8 +70,8 @@ class AbstractTableView : public AbstractView { void scroll_into_view(const ModelIndex&, Orientation); - virtual ModelIndex index_at_event_position(const Point&, bool& is_toggle) const; - virtual ModelIndex index_at_event_position(const Point&) const override; + virtual ModelIndex index_at_event_position(const Gfx::Point&, bool& is_toggle) const; + virtual ModelIndex index_at_event_position(const Gfx::Point&) const override; protected: virtual ~AbstractTableView() override; @@ -91,7 +91,7 @@ class AbstractTableView : public AbstractView { void paint_headers(Painter&); Rect header_rect(int column) const; - static const Font& header_font(); + static const Gfx::Font& header_font(); void update_headers(); void set_hovered_header_index(int); @@ -121,7 +121,7 @@ class AbstractTableView : public AbstractView { bool m_in_column_resize { false }; bool m_alternating_row_colors { true }; int m_horizontal_padding { 5 }; - Point m_column_resize_origin; + Gfx::Point m_column_resize_origin; int m_column_resize_original_width { 0 }; int m_resizing_column { -1 }; int m_pressed_column_header_index { -1 }; diff --git a/Libraries/LibGUI/GAbstractView.cpp b/Libraries/LibGUI/GAbstractView.cpp index 6f1775b447c543..65a58a1b4d9b38 100644 --- a/Libraries/LibGUI/GAbstractView.cpp +++ b/Libraries/LibGUI/GAbstractView.cpp @@ -161,7 +161,7 @@ void AbstractView::notify_selection_changed(Badge) update(); } -NonnullRefPtr AbstractView::font_for_index(const ModelIndex& index) const +NonnullRefPtr AbstractView::font_for_index(const ModelIndex& index) const { if (!model()) return font(); @@ -226,7 +226,7 @@ void AbstractView::mousemove_event(MouseEvent& event) dbg() << "Initiate drag!"; auto drag_operation = DragOperation::construct(); - RefPtr bitmap; + RefPtr bitmap; StringBuilder text_builder; StringBuilder data_builder; diff --git a/Libraries/LibGUI/GAbstractView.h b/Libraries/LibGUI/GAbstractView.h index e3de39c7980362..094b779ff1bf9e 100644 --- a/Libraries/LibGUI/GAbstractView.h +++ b/Libraries/LibGUI/GAbstractView.h @@ -56,7 +56,7 @@ class AbstractView : public ScrollableWidget { virtual void did_update_selection(); virtual Rect content_rect(const ModelIndex&) const { return {}; } - virtual ModelIndex index_at_event_position(const Point&) const = 0; + virtual ModelIndex index_at_event_position(const Gfx::Point&) const = 0; void begin_editing(const ModelIndex&); void stop_editing(); @@ -72,7 +72,7 @@ class AbstractView : public ScrollableWidget { void notify_selection_changed(Badge); - NonnullRefPtr font_for_index(const ModelIndex&) const; + NonnullRefPtr font_for_index(const ModelIndex&) const; protected: explicit AbstractView(Widget* parent); @@ -92,9 +92,9 @@ class AbstractView : public ScrollableWidget { bool m_editable { false }; ModelIndex m_edit_index; RefPtr m_edit_widget; - Rect m_edit_widget_content_rect; + Gfx::Rect m_edit_widget_content_rect; - Point m_left_mousedown_position; + Gfx::Point m_left_mousedown_position; bool m_might_drag { false }; private: diff --git a/Libraries/LibGUI/GAction.cpp b/Libraries/LibGUI/GAction.cpp index 572da69c7bbbdb..184a73610e18d1 100644 --- a/Libraries/LibGUI/GAction.cpp +++ b/Libraries/LibGUI/GAction.cpp @@ -36,47 +36,47 @@ namespace CommonActions { NonnullRefPtr make_open_action(Function callback, Core::Object* parent) { - return Action::create("Open...", { Mod_Ctrl, Key_O }, GraphicsBitmap::load_from_file("/res/icons/16x16/open.png"), move(callback), parent); + return Action::create("Open...", { Mod_Ctrl, Key_O }, Gfx::Bitmap::load_from_file("/res/icons/16x16/open.png"), move(callback), parent); } NonnullRefPtr make_move_to_front_action(Function callback, Core::Object* parent) { - return Action::create("Move to front", { Mod_Ctrl | Mod_Shift, Key_Up }, GraphicsBitmap::load_from_file("/res/icons/16x16/move-to-front.png"), move(callback), parent); + return Action::create("Move to front", { Mod_Ctrl | Mod_Shift, Key_Up }, Gfx::Bitmap::load_from_file("/res/icons/16x16/move-to-front.png"), move(callback), parent); } NonnullRefPtr make_move_to_back_action(Function callback, Core::Object* parent) { - return Action::create("Move to back", { Mod_Ctrl | Mod_Shift, Key_Down }, GraphicsBitmap::load_from_file("/res/icons/16x16/move-to-back.png"), move(callback), parent); + return Action::create("Move to back", { Mod_Ctrl | Mod_Shift, Key_Down }, Gfx::Bitmap::load_from_file("/res/icons/16x16/move-to-back.png"), move(callback), parent); } NonnullRefPtr make_undo_action(Function callback, Core::Object* parent) { - return Action::create("Undo", { Mod_Ctrl, Key_Z }, GraphicsBitmap::load_from_file("/res/icons/16x16/undo.png"), move(callback), parent); + return Action::create("Undo", { Mod_Ctrl, Key_Z }, Gfx::Bitmap::load_from_file("/res/icons/16x16/undo.png"), move(callback), parent); } NonnullRefPtr make_redo_action(Function callback, Core::Object* parent) { - return Action::create("Redo", { Mod_Ctrl, Key_Y }, GraphicsBitmap::load_from_file("/res/icons/16x16/redo.png"), move(callback), parent); + return Action::create("Redo", { Mod_Ctrl, Key_Y }, Gfx::Bitmap::load_from_file("/res/icons/16x16/redo.png"), move(callback), parent); } NonnullRefPtr make_delete_action(Function callback, Core::Object* parent) { - return Action::create("Delete", { Mod_None, Key_Delete }, GraphicsBitmap::load_from_file("/res/icons/16x16/delete.png"), move(callback), parent); + return Action::create("Delete", { Mod_None, Key_Delete }, Gfx::Bitmap::load_from_file("/res/icons/16x16/delete.png"), move(callback), parent); } NonnullRefPtr make_cut_action(Function callback, Core::Object* parent) { - return Action::create("Cut", { Mod_Ctrl, Key_X }, GraphicsBitmap::load_from_file("/res/icons/cut16.png"), move(callback), parent); + return Action::create("Cut", { Mod_Ctrl, Key_X }, Gfx::Bitmap::load_from_file("/res/icons/cut16.png"), move(callback), parent); } NonnullRefPtr make_copy_action(Function callback, Core::Object* parent) { - return Action::create("Copy", { Mod_Ctrl, Key_C }, GraphicsBitmap::load_from_file("/res/icons/16x16/edit-copy.png"), move(callback), parent); + return Action::create("Copy", { Mod_Ctrl, Key_C }, Gfx::Bitmap::load_from_file("/res/icons/16x16/edit-copy.png"), move(callback), parent); } NonnullRefPtr make_paste_action(Function callback, Core::Object* parent) { - return Action::create("Paste", { Mod_Ctrl, Key_V }, GraphicsBitmap::load_from_file("/res/icons/paste16.png"), move(callback), parent); + return Action::create("Paste", { Mod_Ctrl, Key_V }, Gfx::Bitmap::load_from_file("/res/icons/paste16.png"), move(callback), parent); } NonnullRefPtr make_fullscreen_action(Function callback, Core::Object* parent) @@ -91,22 +91,22 @@ NonnullRefPtr make_quit_action(Function callback) NonnullRefPtr make_go_back_action(Function callback, Core::Object* parent) { - return Action::create("Go back", { Mod_Alt, Key_Left }, GraphicsBitmap::load_from_file("/res/icons/16x16/go-back.png"), move(callback), parent); + return Action::create("Go back", { Mod_Alt, Key_Left }, Gfx::Bitmap::load_from_file("/res/icons/16x16/go-back.png"), move(callback), parent); } NonnullRefPtr make_go_forward_action(Function callback, Core::Object* parent) { - return Action::create("Go forward", { Mod_Alt, Key_Right }, GraphicsBitmap::load_from_file("/res/icons/16x16/go-forward.png"), move(callback), parent); + return Action::create("Go forward", { Mod_Alt, Key_Right }, Gfx::Bitmap::load_from_file("/res/icons/16x16/go-forward.png"), move(callback), parent); } NonnullRefPtr make_go_home_action(Function callback, Core::Object* parent) { - return Action::create("Go home", { Mod_Alt, Key_Home }, GraphicsBitmap::load_from_file("/res/icons/16x16/go-home.png"), move(callback), parent); + return Action::create("Go home", { Mod_Alt, Key_Home }, Gfx::Bitmap::load_from_file("/res/icons/16x16/go-home.png"), move(callback), parent); } NonnullRefPtr make_reload_action(Function callback, Core::Object* parent) { - return Action::create("Reload", { Mod_Ctrl, Key_R }, GraphicsBitmap::load_from_file("/res/icons/16x16/reload.png"), move(callback), parent); + return Action::create("Reload", { Mod_Ctrl, Key_R }, Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png"), move(callback), parent); } } @@ -118,7 +118,7 @@ Action::Action(const StringView& text, Function on_activation_cal { } -Action::Action(const StringView& text, RefPtr&& icon, Function on_activation_callback, Core::Object* parent) +Action::Action(const StringView& text, RefPtr&& icon, Function on_activation_callback, Core::Object* parent) : Core::Object(parent) , on_activation(move(on_activation_callback)) , m_text(text) @@ -131,7 +131,7 @@ Action::Action(const StringView& text, const Shortcut& shortcut, Function&& icon, Function on_activation_callback, Core::Object* parent) +Action::Action(const StringView& text, const Shortcut& shortcut, RefPtr&& icon, Function on_activation_callback, Core::Object* parent) : Core::Object(parent) , on_activation(move(on_activation_callback)) , m_text(text) diff --git a/Libraries/LibGUI/GAction.h b/Libraries/LibGUI/GAction.h index 85ecba48a9f2a9..20899bb7607ed4 100644 --- a/Libraries/LibGUI/GAction.h +++ b/Libraries/LibGUI/GAction.h @@ -76,7 +76,7 @@ class Action final : public Core::Object { { return adopt(*new Action(text, move(callback), parent)); } - static NonnullRefPtr create(const StringView& text, RefPtr&& icon, Function callback, Core::Object* parent = nullptr) + static NonnullRefPtr create(const StringView& text, RefPtr&& icon, Function callback, Core::Object* parent = nullptr) { return adopt(*new Action(text, move(icon), move(callback), parent)); } @@ -84,7 +84,7 @@ class Action final : public Core::Object { { return adopt(*new Action(text, shortcut, move(callback), parent)); } - static NonnullRefPtr create(const StringView& text, const Shortcut& shortcut, RefPtr&& icon, Function callback, Core::Object* parent = nullptr) + static NonnullRefPtr create(const StringView& text, const Shortcut& shortcut, RefPtr&& icon, Function callback, Core::Object* parent = nullptr) { return adopt(*new Action(text, shortcut, move(icon), move(callback), parent)); } @@ -92,8 +92,8 @@ class Action final : public Core::Object { String text() const { return m_text; } Shortcut shortcut() const { return m_shortcut; } - const GraphicsBitmap* icon() const { return m_icon.ptr(); } - void set_icon(const GraphicsBitmap* icon) { m_icon = icon; } + const Gfx::Bitmap* icon() const { return m_icon.ptr(); } + void set_icon(const Gfx::Bitmap* icon) { m_icon = icon; } const Core::Object* activator() const { return m_activator.ptr(); } Core::Object* activator() { return m_activator.ptr(); } @@ -128,8 +128,8 @@ class Action final : public Core::Object { Action(const StringView& text, Function = nullptr, Core::Object* = nullptr); Action(const StringView& text, const Shortcut&, Function = nullptr, Core::Object* = nullptr); - Action(const StringView& text, const Shortcut&, RefPtr&& icon, Function = nullptr, Core::Object* = nullptr); - Action(const StringView& text, RefPtr&& icon, Function = nullptr, Core::Object* = nullptr); + Action(const StringView& text, const Shortcut&, RefPtr&& icon, Function = nullptr, Core::Object* = nullptr); + Action(const StringView& text, RefPtr&& icon, Function = nullptr, Core::Object* = nullptr); template void for_each_toolbar_button(Callback); @@ -137,7 +137,7 @@ class Action final : public Core::Object { void for_each_menu_item(Callback); String m_text; - RefPtr m_icon; + RefPtr m_icon; Shortcut m_shortcut; bool m_enabled { true }; bool m_checkable { false }; diff --git a/Libraries/LibGUI/GApplication.cpp b/Libraries/LibGUI/GApplication.cpp index 9afcebb45be529..2dcb83f4acace7 100644 --- a/Libraries/LibGUI/GApplication.cpp +++ b/Libraries/LibGUI/GApplication.cpp @@ -113,8 +113,8 @@ class Application::TooltipWindow final : public Window { m_label->set_background_color(Color::from_rgb(0xdac7b5)); m_label->set_fill_with_background_color(true); m_label->set_frame_thickness(1); - m_label->set_frame_shape(FrameShape::Container); - m_label->set_frame_shadow(FrameShadow::Plain); + m_label->set_frame_shape(Gfx::FrameShape::Container); + m_label->set_frame_shadow(Gfx::FrameShadow::Plain); set_main_widget(m_label); } @@ -129,7 +129,7 @@ class Application::TooltipWindow final : public Window { RefPtr