RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 18:17:44 +00:00
Code Issues Activity Actions

LibGUI: Put all classes in the GUI namespace and remove the leading G

Browse source 
This took me a moment. Welcome to the new world of GUI::Widget! :^)
This commit is contained in:
Andreas Kling 2020-02-02 15:07:41 +01:00
parent 2d39da5405
commit c5bd9d4ed1
337 changed files with 5400 additions and 4816 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Applications/QuickShow/QSWidget.cpp
View file

@ -31,8 +31,8 @@
#include <LibGUI/GPainter.h>
#include <LibGUI/GWindow.h>
QSWidget::QSWidget(GWidget* parent)
: GFrame(parent)
QSWidget::QSWidget(GUI::Widget* parent)
: GUI::Frame(parent)
{
set_frame_shape(FrameShape::Container);
set_frame_shadow(FrameShadow::Sunken);
@ -61,36 +61,36 @@ void QSWidget::relayout()
update();
}
void QSWidget::resize_event(GResizeEvent& event)
void QSWidget::resize_event(GUI::ResizeEvent& event)
{
relayout();
GWidget::resize_event(event);
GUI::Widget::resize_event(event);
}
void QSWidget::paint_event(GPaintEvent& event)
void QSWidget::paint_event(GUI::PaintEvent& event)
{
GPainter painter(*this);
GUI::Painter painter(*this);
painter.add_clip_rect(event.rect());
painter.draw_scaled_bitmap(m_bitmap_rect, *m_bitmap, m_bitmap->rect());
}
void QSWidget::mousedown_event(GMouseEvent& event)
void QSWidget::mousedown_event(GUI::MouseEvent& event)
{
if (event.button() != GMouseButton::Left)
if (event.button() != GUI::MouseButton::Left)
return;
m_pan_origin = event.position();
m_pan_bitmap_origin = m_bitmap_rect.location();
}
void QSWidget::mouseup_event(GMouseEvent& event)
void QSWidget::mouseup_event(GUI::MouseEvent& event)
{
UNUSED_PARAM(event);
}
void QSWidget::mousemove_event(GMouseEvent& event)
void QSWidget::mousemove_event(GUI::MouseEvent& event)
{
if (!(event.buttons() & GMouseButton::Left))
if (!(event.buttons() & GUI::MouseButton::Left))
return;
auto delta = event.position() - m_pan_origin;
@ -98,7 +98,7 @@ void QSWidget::mousemove_event(GMouseEvent& event)
update();
}
void QSWidget::mousewheel_event(GMouseEvent& event)
void QSWidget::mousewheel_event(GUI::MouseEvent& event)
{
auto old_scale = m_scale;
auto old_scale_factor = (float)m_scale / 100.0f;
@ -125,7 +125,7 @@ void QSWidget::set_path(const String& path)
m_path = path;
}
void QSWidget::drop_event(GDropEvent& event)
void QSWidget::drop_event(GUI::DropEvent& event)
{
event.accept();
window()->move_to_front();
@ -135,13 +135,13 @@ void QSWidget::drop_event(GDropEvent& event)
if (lines.is_empty())
return;
if (lines.size() > 1) {
GMessageBox::show("QuickShow can only open one file at a time!", "One at a time please!", GMessageBox::Type::Error, GMessageBox::InputType::OK, window());
GUI::MessageBox::show("QuickShow can only open one file at a time!", "One at a time please!", GUI::MessageBox::Type::Error, GUI::MessageBox::InputType::OK, window());
return;
}
URL url(lines[0]);
auto bitmap = GraphicsBitmap::load_from_file(url.path());
if (!bitmap) {
GMessageBox::show(String::format("Failed to open %s", url.to_string().characters()), "Cannot open image", GMessageBox::Type::Error, GMessageBox::InputType::OK, window());
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;
}

19
Applications/QuickShow/QSWidget.h
View file

@ -28,10 +28,9 @@
#include <LibGUI/GFrame.h>
class GLabel;
class QSLabel;
class QSWidget final : public GFrame {
class QSWidget final : public GUI::Frame {
C_OBJECT(QSWidget)
public:
virtual ~QSWidget() override;
@ -45,14 +44,14 @@ public:
Function<void(int)> on_scale_change;
private:
explicit QSWidget(GWidget* parent = nullptr);
virtual void paint_event(GPaintEvent&) override;
virtual void resize_event(GResizeEvent&) override;
virtual void mousedown_event(GMouseEvent&) override;
virtual void mouseup_event(GMouseEvent&) override;
virtual void mousemove_event(GMouseEvent&) override;
virtual void mousewheel_event(GMouseEvent&) override;
virtual void drop_event(GDropEvent&) override;
explicit QSWidget(GUI::Widget* parent = nullptr);
virtual void paint_event(GUI::PaintEvent&) override;
virtual void resize_event(GUI::ResizeEvent&) override;
virtual void mousedown_event(GUI::MouseEvent&) override;
virtual void mouseup_event(GUI::MouseEvent&) override;
virtual void mousemove_event(GUI::MouseEvent&) override;
virtual void mousewheel_event(GUI::MouseEvent&) override;
virtual void drop_event(GUI::DropEvent&) override;
void relayout();

18
Applications/QuickShow/main.cpp
View file

@ -42,27 +42,27 @@ int main(int argc, char** argv)
return 1;
}
GApplication app(argc, argv);
GUI::Application app(argc, argv);
if (pledge("stdio shared_buffer accept rpath", nullptr) < 0) {
perror("pledge");
return 1;
}
auto menubar = make<GMenuBar>();
auto menubar = make<GUI::MenuBar>();
auto app_menu = GMenu::construct("QuickShow");
app_menu->add_action(GCommonActions::make_quit_action([](auto&) {
GApplication::the().quit(0);
auto app_menu = GUI::Menu::construct("QuickShow");
app_menu->add_action(GUI::CommonActions::make_quit_action([](auto&) {
GUI::Application::the().quit(0);
return;
}));
menubar->add_menu(move(app_menu));
auto file_menu = GMenu::construct("File");
auto file_menu = GUI::Menu::construct("File");
menubar->add_menu(move(file_menu));
auto help_menu = GMenu::construct("Help");
help_menu->add_action(GAction::create("About", [](const GAction&) {
auto help_menu = GUI::Menu::construct("Help");
help_menu->add_action(GUI::Action::create("About", [](const GUI::Action&) {
dbgprintf("FIXME: Implement Help/About\n");
}));
menubar->add_menu(move(help_menu));
@ -86,7 +86,7 @@ int main(int argc, char** argv)
return 1;
}
auto window = GWindow::construct();
auto window = GUI::Window::construct();
auto widget = QSWidget::construct();
widget->set_path(path);
widget->set_bitmap(*bitmap);