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

IRCClient: Add a toolbar with some actions.

Browse source
This commit is contained in:
Andreas Kling 2019-03-15 23:24:40 +01:00
parent b54ab06595
commit 3a3aa74b2e
13 changed files with 76 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
LibGUI/GBoxLayout.cpp
View file

@ -1,12 +1,9 @@
#include <LibGUI/GBoxLayout.h>
#include <LibGUI/GWidget.h>
#include <stdio.h>
//#define GBOXLAYOUT_DEBUG
#ifdef GBOXLAYOUT_DEBUG
#include <stdio.h>
#endif
GBoxLayout::GBoxLayout(Orientation orientation)
: m_orientation(orientation)
{
@ -35,6 +32,12 @@ static Size compute_preferred_size(GLayout::Entry& entry)
void GBoxLayout::run(GWidget& widget)
{
bool should_log = false;
#ifdef GBOXLAYOUT_DEBUG
should_log = true;
#endif
if (should_log)
printf("GBoxLayout: running layout on %s{%p}\n", widget.class_name(), &widget);
if (m_entries.is_empty())
return;
@ -43,20 +46,34 @@ void GBoxLayout::run(GWidget& widget)
int number_of_visible_entries = 0;
if (should_log)
printf("GBoxLayout: Starting with available size: %s\n", available_size.to_string().characters());
for (auto& entry : m_entries) {
if (!entry.widget->is_visible())
continue;
++number_of_visible_entries;
if (entry.widget && entry.widget->size_policy(orientation()) == SizePolicy::Fixed) {
if (should_log) {
printf("GBoxLayout: Subtracting for fixed %s{%p}, size: %s\n", entry.widget->class_name(), entry.widget.ptr(), entry.widget->preferred_size().to_string().characters());
printf("GBoxLayout: Available size before: %s\n", available_size.to_string().characters());
}
available_size -= entry.widget->preferred_size();
if (should_log)
printf("GBoxLayout: Available size after: %s\n", available_size.to_string().characters());
++number_of_entries_with_fixed_size;
}
}
if (should_log)
printf("GBoxLayout: Number of visible: %d/%d\n", number_of_visible_entries, m_entries.size());
int number_of_entries_with_automatic_size = number_of_visible_entries - number_of_entries_with_fixed_size;
#ifdef GBOXLAYOUT_DEBUG
printf("GBoxLayout: available_size=%s, fixed=%d, fill=%d\n", available_size.to_string().characters(), number_of_entries_with_fixed_size, number_of_entries_with_automatic_size);
if (should_log)
printf("GBoxLayout: available_size=%s, fixed=%d, fill=%d\n", available_size.to_string().characters(), number_of_entries_with_fixed_size, number_of_entries_with_automatic_size);
#endif
Size automatic_size;
@ -72,7 +89,8 @@ void GBoxLayout::run(GWidget& widget)
}
#ifdef GBOXLAYOUT_DEBUG
printf("GBoxLayout: automatic_size=%s\n", automatic_size.to_string().characters());
if (should_log)
printf("GBoxLayout: automatic_size=%s\n", automatic_size.to_string().characters());
#endif
int current_x = margins().left();
@ -106,7 +124,8 @@ void GBoxLayout::run(GWidget& widget)
}
#ifdef GBOXLAYOUT_DEBUG
printf("GBoxLayout: apply, %s{%p} <- %s\n", entry.widget->class_name(), entry.widget.ptr(), rect.to_string().characters());
if (should_log)
printf("GBoxLayout: apply, %s{%p} <- %s\n", entry.widget->class_name(), entry.widget.ptr(), rect.to_string().characters());
#endif
entry.widget->set_relative_rect(rect);

3
LibGUI/GStackWidget.cpp
View file

@ -34,7 +34,7 @@ void GStackWidget::resize_event(GResizeEvent& event)
void GStackWidget::child_event(GChildEvent& event)
{
if (!event.child() || !event.child()->is_widget())
return;
return GWidget::child_event(event);
auto& child = static_cast<GWidget&>(*event.child());
if (event.type() == GEvent::ChildAdded) {
if (!m_active_widget)
@ -53,4 +53,5 @@ void GStackWidget::child_event(GChildEvent& event)
set_active_widget(new_active_widget);
}
}
GWidget::child_event(event);
}

5
LibGUI/GToolBar.cpp
View file

@ -36,6 +36,8 @@ void GToolBar::add_action(Retained<GAction>&& action)
button->set_button_style(GButtonStyle::CoolBar);
button->set_size_policy(SizePolicy::Fixed, SizePolicy::Fixed);
ASSERT(button->size_policy(Orientation::Horizontal) == SizePolicy::Fixed);
ASSERT(button->size_policy(Orientation::Vertical) == SizePolicy::Fixed);
button->set_preferred_size({ 24, 24 });
m_items.append(move(item));
@ -60,6 +62,9 @@ public:
painter.draw_line({ 0, 0 }, { 0, rect().bottom() }, Color::DarkGray);
painter.draw_line({ 1, 0 }, { 1, rect().bottom() }, Color::White);
}
private:
virtual const char* class_name() const override { return "SeparatorWidget"; }
};
void GToolBar::add_separator()

12
LibGUI/GWidget.cpp
View file

@ -15,15 +15,21 @@ GWidget::GWidget(GWidget* parent)
set_font(nullptr);
m_background_color = Color::LightGray;
m_foreground_color = Color::Black;
if (parent && parent->layout())
parent->layout()->add_widget(*this);
}
GWidget::~GWidget()
{
}
void GWidget::child_event(GChildEvent& event)
{
if (event.type() == GEvent::ChildAdded) {
if (event.child() && event.child()->is_widget() && layout())
layout()->add_widget(static_cast<GWidget&>(*event.child()));
}
return GObject::child_event(event);
}
void GWidget::set_relative_rect(const Rect& rect)
{
if (rect == m_relative_rect)

1
LibGUI/GWidget.h
View file

@ -47,6 +47,7 @@ public:
virtual void focusout_event(GEvent&);
virtual void enter_event(GEvent&);
virtual void leave_event(GEvent&);
virtual void child_event(GChildEvent&) override;
Rect relative_rect() const { return m_relative_rect; }
Point relative_position() const { return m_relative_rect.location(); }