RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-01 11:48:13 +00:00
Code Issues Activity Actions

LibGUI: Remove some header dependencies from Application.h

Browse source
This commit is contained in:
Andreas Kling 2020-02-15 01:18:12 +01:00
parent 93e9c2732b
commit dcb0766d3f
4 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Applications/SystemMonitor/main.cpp
View file

@ -52,6 +52,7 @@
#include <LibGUI/ToolBar.h> #include <LibGUI/ToolBar.h>
#include <LibGUI/Widget.h> #include <LibGUI/Widget.h>
#include <LibGUI/Window.h> #include <LibGUI/Window.h>
#include <LibGfx/Palette.h>
#include <LibPCIDB/Database.h> #include <LibPCIDB/Database.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
@ -145,11 +146,13 @@ int main(int argc, char** argv)
toolbar->set_has_frame(false); toolbar->set_has_frame(false);
auto process_table_view = ProcessTableView::construct(process_table_container); auto process_table_view = ProcessTableView::construct(process_table_container);
auto refresh_timer = Core::Timer::construct(1000, [&] { auto refresh_timer = Core::Timer::construct(
1000, [&] {
process_table_view->refresh(); process_table_view->refresh();
if (auto* memory_stats_widget = MemoryStatsWidget::the()) if (auto* memory_stats_widget = MemoryStatsWidget::the())
memory_stats_widget->refresh(); memory_stats_widget->refresh();
}, window); },
window);
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&) { 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(); pid_t pid = process_table_view->selected_pid();

1
Applications/Terminal/main.cpp
View file

@ -40,6 +40,7 @@
#include <LibGUI/Widget.h> #include <LibGUI/Widget.h>
#include <LibGUI/Window.h> #include <LibGUI/Window.h>
#include <LibGfx/Font.h> #include <LibGfx/Font.h>
#include <LibGfx/Palette.h>
#include <LibVT/TerminalWidget.h> #include <LibVT/TerminalWidget.h>
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>

5
Libraries/LibGUI/Application.cpp
View file

@ -189,4 +189,9 @@ void Application::set_palette(const Palette& palette)
m_palette = palette.impl(); m_palette = palette.impl();
} }
Gfx::Palette Application::palette() const
{
return Palette(*m_palette);
}
} }

7
Libraries/LibGUI/Application.h
View file

@ -26,20 +26,17 @@
#pragma once #pragma once
#include <AK/Badge.h>
#include <AK/HashMap.h> #include <AK/HashMap.h>
#include <AK/OwnPtr.h> #include <AK/OwnPtr.h>
#include <LibCore/Forward.h> #include <LibCore/Forward.h>
#include <LibGUI/Shortcut.h> #include <LibGUI/Shortcut.h>
#include <LibGfx/Forward.h> #include <LibGfx/Forward.h>
#include <LibGfx/Palette.h>
namespace GUI { namespace GUI {
class Action; class Action;
class KeyEvent; class KeyEvent;
class MenuBar; class MenuBar;
class Window; class Window;
class WindowServerConnection;
class Application { class Application {
public: public:
@ -68,8 +65,8 @@ public:
const String& invoked_as() const { return m_invoked_as; } const String& invoked_as() const { return m_invoked_as; }
const Vector<String>& args() const { return m_args; } const Vector<String>& args() const { return m_args; }
Palette palette() const { return Palette(*m_palette); } Gfx::Palette palette() const;
void set_palette(const Palette&); void set_palette(const Gfx::Palette&);
void set_system_palette(SharedBuffer&); void set_system_palette(SharedBuffer&);