system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-07 00:19:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Taskbar: Add a factory function for TaskbarWindow

Browse source 
This means the errors all the way from Individual widgets get propagated
up.
This commit is contained in:
Arda Cinar 2022-12-23 22:00:17 +03:00 committed by Andreas Kling
parent f40cb8d771
commit 1acc788500
3 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
Userland/Services/Taskbar/TaskbarWindow.cpp
View file

@ -10,6 +10,8 @@
#include "QuickLaunchWidget.h"
#include "TaskbarButton.h"
#include <AK/Debug.h>
#include <AK/Error.h>
#include <AK/String.h>
#include <LibCore/StandardPaths.h>
#include <LibGUI/BoxLayout.h>
#include <LibGUI/Button.h>
@ -52,6 +54,13 @@ private:
}
};
ErrorOr<NonnullRefPtr<TaskbarWindow>> TaskbarWindow::create()
{
auto window = TRY(AK::adopt_nonnull_ref_or_enomem(new (nothrow) TaskbarWindow()));
TRY(window->populate_taskbar());
return window;
}
TaskbarWindow::TaskbarWindow()
{
set_window_type(GUI::WindowType::Taskbar);
@ -62,23 +71,28 @@ TaskbarWindow::TaskbarWindow()
auto& main_widget = set_main_widget<TaskbarWidget>();
main_widget.set_layout<GUI::HorizontalBoxLayout>();
main_widget.layout()->set_margins({ 2, 3, 0, 3 });
}
// FIXME: Propagate this error up as well
m_quick_launch = MUST(Taskbar::QuickLaunchWidget::create());
main_widget.add_child(*m_quick_launch);
ErrorOr<void> TaskbarWindow::populate_taskbar()
{
if (!main_widget())
return Error::from_string_literal("TaskbarWindow::populate_taskbar: main_widget is not set");
m_task_button_container = main_widget.add<GUI::Widget>();
m_quick_launch = TRY(Taskbar::QuickLaunchWidget::create());
main_widget()->add_child(*m_quick_launch);
m_task_button_container = main_widget()->add<GUI::Widget>();
m_task_button_container->set_layout<GUI::HorizontalBoxLayout>();
m_task_button_container->layout()->set_spacing(3);
m_default_icon = Gfx::Bitmap::try_load_from_file("/res/icons/16x16/window.png"sv).release_value_but_fixme_should_propagate_errors();
m_default_icon = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/window.png"sv));
m_applet_area_container = main_widget.add<GUI::Frame>();
m_applet_area_container = main_widget()->add<GUI::Frame>();
m_applet_area_container->set_frame_thickness(1);
m_applet_area_container->set_frame_shape(Gfx::FrameShape::Box);
m_applet_area_container->set_frame_shadow(Gfx::FrameShadow::Sunken);
m_clock_widget = main_widget.add<Taskbar::ClockWidget>();
m_clock_widget = main_widget()->add<Taskbar::ClockWidget>();
m_show_desktop_button = GUI::Button::construct();
m_show_desktop_button->set_tooltip("Show Desktop");
@ -86,10 +100,17 @@ TaskbarWindow::TaskbarWindow()
m_show_desktop_button->set_button_style(Gfx::ButtonStyle::Coolbar);
m_show_desktop_button->set_fixed_size(24, 24);
m_show_desktop_button->on_click = TaskbarWindow::show_desktop_button_clicked;
main_widget.add_child(*m_show_desktop_button);
main_widget()->add_child(*m_show_desktop_button);
auto af_path = DeprecatedString::formatted("{}/{}", Desktop::AppFile::APP_FILES_DIRECTORY, "Assistant.af");
return {};
}
ErrorOr<void> TaskbarWindow::load_assistant()
{
auto af_path = TRY(String::formatted("{}/{}", Desktop::AppFile::APP_FILES_DIRECTORY, "Assistant.af"));
m_assistant_app_file = Desktop::AppFile::open(af_path);
return {};
}
void TaskbarWindow::add_system_menu(NonnullRefPtr<GUI::Menu> system_menu)

5
Userland/Services/Taskbar/TaskbarWindow.h
View file

@ -8,6 +8,7 @@
#include "ClockWidget.h"
#include "WindowList.h"
#include <AK/NonnullRefPtr.h>
#include <LibConfig/Listener.h>
#include <LibDesktop/AppFile.h>
#include <LibGUI/Widget.h>
@ -21,6 +22,7 @@ class TaskbarWindow final : public GUI::Window
C_OBJECT(TaskbarWindow);
public:
static ErrorOr<NonnullRefPtr<TaskbarWindow>> create();
virtual ~TaskbarWindow() override = default;
static int taskbar_height() { return 27; }
@ -40,6 +42,9 @@ private:
void remove_window_button(::Window&, bool);
void update_window_button(::Window&, bool);
ErrorOr<void> populate_taskbar();
ErrorOr<void> load_assistant();
virtual void event(Core::Event&) override;
virtual void wm_event(GUI::WMEvent&) override;
virtual void screen_rects_change_event(GUI::ScreenRectsChangeEvent&) override;

2
Userland/Services/Taskbar/main.cpp
View file

@ -58,7 +58,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(Core::System::pledge("stdio recvfd sendfd proc exec rpath"));
auto window = TRY(TaskbarWindow::try_create());
auto window = TRY(TaskbarWindow::create());
auto menu = TRY(build_system_menu(*window));
menu->realize_menu_if_needed();