RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 18:22:45 +00:00
Code Issues Activity Actions

LibGUI: Make GUI::Frame have the 2px sunken container look by default

Browse source 
The overwhelming majority of GUI::Frame users set the same appearance,
so let's just make it the default.
This commit is contained in:
Andreas Kling 2020-02-23 11:09:20 +01:00
parent 3d20da9ee4
commit bfd86c4631
27 changed files with 7 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Applications/FileManager/PropertiesDialog.cpp
View file

@ -276,9 +276,6 @@ void PropertiesDialog::make_divider(NonnullRefPtr<GUI::Widget>& parent)
auto divider = parent->add<GUI::Frame>();
divider->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
divider->set_preferred_size({ 0, 2 });
divider->set_frame_shape(Gfx::FrameShape::HorizontalLine);
divider->set_frame_shadow(Gfx::FrameShadow::Sunken);
divider->set_frame_thickness(2);
parent->layout()->add_spacer();
}

3
Applications/FontEditor/GlyphEditorWidget.cpp
View file

@ -32,9 +32,6 @@
GlyphEditorWidget::GlyphEditorWidget(Gfx::Font& mutable_font)
: m_font(mutable_font)
{
set_frame_thickness(2);
set_frame_shadow(Gfx::FrameShadow::Sunken);
set_frame_shape(Gfx::FrameShape::Container);
set_relative_rect({ 0, 0, preferred_width(), preferred_height() });
}

3
Applications/FontEditor/GlyphMapWidget.cpp
View file

@ -32,9 +32,6 @@
GlyphMapWidget::GlyphMapWidget(Gfx::Font& mutable_font)
: m_font(mutable_font)
{
set_frame_thickness(2);
set_frame_shape(Gfx::FrameShape::Container);
set_frame_shadow(Gfx::FrameShadow::Sunken);
set_relative_rect({ 0, 0, preferred_width(), preferred_height() });
}

3
Applications/HexEditor/HexEditor.cpp
View file

@ -44,9 +44,6 @@
HexEditor::HexEditor(GUI::Widget* parent)
: ScrollableWidget(parent)
{
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"));
set_background_role(ColorRole::Base);

9
Applications/PaintBrush/PaletteWidget.cpp
View file

@ -37,9 +37,6 @@ public:
: m_palette_widget(palette_widget)
, m_color(color)
{
set_frame_thickness(2);
set_frame_shadow(Gfx::FrameShadow::Sunken);
set_frame_shape(Gfx::FrameShape::Container);
}
virtual ~ColorWidget() override
@ -83,17 +80,11 @@ PaletteWidget::PaletteWidget(PaintableWidget& paintable_widget)
set_preferred_size(0, 34);
m_secondary_color_widget = add<GUI::Frame>();
m_secondary_color_widget->set_frame_thickness(2);
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 = add<GUI::Frame>();
m_primary_color_widget->set_frame_thickness(2);
m_primary_color_widget->set_frame_shape(Gfx::FrameShape::Container);
m_primary_color_widget->set_frame_shadow(Gfx::FrameShadow::Sunken);
Gfx::Rect rect { 0, 0, 38, 15 };
rect.center_within(m_secondary_color_widget->relative_rect());
m_primary_color_widget->set_relative_rect(rect);

3
Applications/Piano/KeysWidget.cpp
View file

@ -32,9 +32,6 @@
KeysWidget::KeysWidget(AudioEngine& audio_engine)
: m_audio_engine(audio_engine)
{
set_frame_thickness(2);
set_frame_shadow(Gfx::FrameShadow::Sunken);
set_frame_shape(Gfx::FrameShape::Container);
set_fill_with_background_color(true);
}

3
Applications/Piano/KnobsWidget.cpp
View file

@ -36,9 +36,6 @@ KnobsWidget::KnobsWidget(AudioEngine& audio_engine, MainWidget& main_widget)
: m_audio_engine(audio_engine)
, m_main_widget(main_widget)
{
set_frame_thickness(2);
set_frame_shadow(Gfx::FrameShadow::Sunken);
set_frame_shape(Gfx::FrameShape::Container);
set_layout(make<GUI::VerticalBoxLayout>());
set_fill_with_background_color(true);

4
Applications/Piano/RollWidget.cpp
View file

@ -36,10 +36,6 @@ constexpr int roll_height = note_count * note_height;
RollWidget::RollWidget(AudioEngine& audio_engine)
: m_audio_engine(audio_engine)
{
set_frame_thickness(2);
set_frame_shadow(Gfx::FrameShadow::Sunken);
set_frame_shape(Gfx::FrameShape::Container);
set_should_hide_unnecessary_scrollbars(true);
set_content_size({ 0, roll_height });
vertical_scrollbar().set_value(roll_height / 2);

6
Applications/Piano/SamplerWidget.cpp
View file

@ -36,9 +36,6 @@
WaveEditor::WaveEditor(AudioEngine& audio_engine)
: m_audio_engine(audio_engine)
{
set_frame_thickness(2);
set_frame_shadow(Gfx::FrameShadow::Sunken);
set_frame_shape(Gfx::FrameShape::Container);
}
WaveEditor::~WaveEditor()
@ -94,9 +91,6 @@ void WaveEditor::paint_event(GUI::PaintEvent& event)
SamplerWidget::SamplerWidget(AudioEngine& audio_engine)
: m_audio_engine(audio_engine)
{
set_frame_thickness(2);
set_frame_shadow(Gfx::FrameShadow::Sunken);
set_frame_shape(Gfx::FrameShape::Container);
set_layout(make<GUI::VerticalBoxLayout>());
layout()->set_margins({ 10, 10, 10, 10 });
layout()->set_spacing(10);

3
Applications/Piano/WaveWidget.cpp
View file

@ -33,9 +33,6 @@
WaveWidget::WaveWidget(AudioEngine& audio_engine)
: m_audio_engine(audio_engine)
{
set_frame_thickness(2);
set_frame_shadow(Gfx::FrameShadow::Sunken);
set_frame_shape(Gfx::FrameShape::Container);
}
WaveWidget::~WaveWidget()

4
Applications/QuickShow/QSWidget.cpp
View file

@ -35,10 +35,6 @@
QSWidget::QSWidget(GUI::Widget* parent)
: GUI::Frame(parent)
{
set_frame_shape(Gfx::FrameShape::Container);
set_frame_shadow(Gfx::FrameShadow::Sunken);
set_frame_thickness(2);
set_fill_with_background_color(true);
set_background_color(Color::Black);
}

3
Applications/SoundPlayer/SampleWidget.cpp
View file

@ -31,9 +31,6 @@
SampleWidget::SampleWidget()
{
set_frame_shape(Gfx::FrameShape::Container);
set_frame_shadow(Gfx::FrameShadow::Sunken);
set_frame_thickness(2);
}
SampleWidget::~SampleWidget()

3
Applications/SystemMonitor/GraphWidget.cpp
View file

@ -30,9 +30,6 @@
GraphWidget::GraphWidget()
{
set_frame_thickness(2);
set_frame_shape(Gfx::FrameShape::Container);
set_frame_shadow(Gfx::FrameShadow::Sunken);
}
GraphWidget::~GraphWidget()

4
DevTools/HackStudio/FormEditorWidget.cpp
View file

@ -36,10 +36,6 @@ FormEditorWidget::FormEditorWidget()
set_fill_with_background_color(true);
set_background_color(Color::MidGray);
set_frame_shape(Gfx::FrameShape::Container);
set_frame_shadow(Gfx::FrameShadow::Sunken);
set_frame_thickness(2);
m_form_widget = add<FormWidget>();
m_widget_tree_model = WidgetTreeModel::create(*m_form_widget);
}

3
DevTools/ProfileViewer/ProfileTimelineWidget.cpp
View file

@ -32,9 +32,6 @@ ProfileTimelineWidget::ProfileTimelineWidget(Profile& profile, GUI::Widget* pare
: GUI::Frame(parent)
, m_profile(profile)
{
set_frame_thickness(2);
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);

3
Games/Minesweeper/Field.cpp
View file

@ -132,9 +132,6 @@ Field::Field(GUI::Label& flag_label, GUI::Label& time_label, GUI::Button& face_b
m_time_label.set_text(String::format("%u.%u", m_time_elapsed / 10, m_time_elapsed % 10));
};
m_timer->set_interval(100);
set_frame_thickness(2);
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");

4
Libraries/LibGUI/AbstractTableView.cpp
View file

@ -42,10 +42,6 @@ static const int minimum_column_width = 2;
AbstractTableView::AbstractTableView(Widget* parent)
: AbstractView(parent)
{
set_frame_shape(Gfx::FrameShape::Container);
set_frame_shadow(Gfx::FrameShadow::Sunken);
set_frame_thickness(2);
set_should_hide_unnecessary_scrollbars(true);
}

4
Libraries/LibGUI/ColumnsView.cpp
View file

@ -53,10 +53,6 @@ ColumnsView::ColumnsView(Widget* parent)
set_fill_with_background_color(true);
set_background_role(ColorRole::Base);
set_foreground_role(ColorRole::BaseText);
set_frame_shape(Gfx::FrameShape::Container);
set_frame_shadow(Gfx::FrameShadow::Sunken);
set_frame_thickness(2);
m_columns.append({ {}, 0 });
}

3
Libraries/LibGUI/FilePicker.cpp
View file

@ -225,9 +225,6 @@ FilePicker::FilePicker(Mode mode, const StringView& file_name, const StringView&
auto preview_container = horizontal_container->add<Frame>();
preview_container->set_size_policy(SizePolicy::Fixed, SizePolicy::Fill);
preview_container->set_preferred_size(180, 0);
preview_container->set_frame_shape(Gfx::FrameShape::Container);
preview_container->set_frame_shadow(Gfx::FrameShadow::Sunken);
preview_container->set_frame_thickness(2);
preview_container->set_layout(make<VerticalBoxLayout>());
preview_container->layout()->set_margins({ 8, 8, 8, 8 });

3
Libraries/LibGUI/Frame.cpp
View file

@ -34,6 +34,9 @@ namespace GUI {
Frame::Frame(Widget* parent)
: Widget(parent)
{
set_frame_thickness(2);
set_frame_shape(Gfx::FrameShape::Container);
set_frame_shadow(Gfx::FrameShadow::Sunken);
}
Frame::~Frame()

3
Libraries/LibGUI/ItemView.cpp
View file

@ -42,9 +42,6 @@ ItemView::ItemView(Widget* parent)
{
set_background_role(ColorRole::Base);
set_foreground_role(ColorRole::BaseText);
set_frame_shape(Gfx::FrameShape::Container);
set_frame_shadow(Gfx::FrameShadow::Sunken);
set_frame_thickness(2);
horizontal_scrollbar().set_visible(false);
}

5
Libraries/LibGUI/Label.cpp
View file

@ -33,7 +33,7 @@
namespace GUI {
Label::Label(Widget* parent)
: Frame(parent)
: Label({}, parent)
{
}
@ -41,6 +41,9 @@ Label::Label(const StringView& text, Widget* parent)
: Frame(parent)
, m_text(text)
{
set_frame_thickness(0);
set_frame_shadow(Gfx::FrameShadow::Plain);
set_frame_shape(Gfx::FrameShape::NoFrame);
}
Label::~Label()

3
Libraries/LibGUI/ListView.cpp
View file

@ -38,9 +38,6 @@ ListView::ListView(Widget* parent)
{
set_background_role(ColorRole::Base);
set_foreground_role(ColorRole::BaseText);
set_frame_shape(Gfx::FrameShape::Container);
set_frame_shadow(Gfx::FrameShadow::Sunken);
set_frame_thickness(2);
}
ListView::~ListView()

3
Libraries/LibGUI/ProgressBar.cpp
View file

@ -35,9 +35,6 @@ namespace GUI {
ProgressBar::ProgressBar(Widget* parent)
: Frame(parent)
{
set_frame_shape(Gfx::FrameShape::Container);
set_frame_shadow(Gfx::FrameShadow::Sunken);
set_frame_thickness(2);
}
ProgressBar::~ProgressBar()

3
Libraries/LibGUI/TextEditor.cpp
View file

@ -61,9 +61,6 @@ TextEditor::TextEditor(Type type, Widget* parent)
set_background_role(ColorRole::Base);
set_foreground_role(ColorRole::BaseText);
set_document(TextDocument::create());
set_frame_shape(Gfx::FrameShape::Container);
set_frame_shadow(Gfx::FrameShadow::Sunken);
set_frame_thickness(2);
set_scrollbars_enabled(is_multi_line());
set_font(GFontDatabase::the().get_by_name("Csilla Thin"));
// FIXME: Recompute vertical scrollbar step size on font change.

3
Libraries/LibHTML/HtmlView.cpp
View file

@ -59,9 +59,6 @@ HtmlView::HtmlView()
update(adjusted_rect);
};
set_frame_shape(Gfx::FrameShape::Container);
set_frame_shadow(Gfx::FrameShadow::Sunken);
set_frame_thickness(2);
set_should_hide_unnecessary_scrollbars(true);
set_background_role(ColorRole::Base);
}

4
Libraries/LibVT/TerminalWidget.cpp
View file

@ -92,10 +92,6 @@ TerminalWidget::TerminalWidget(int ptm_fd, bool automatic_size_policy, RefPtr<Co
m_cursor_blink_timer = add<Core::Timer>();
m_visual_beep_timer = add<Core::Timer>();
set_frame_shape(Gfx::FrameShape::Container);
set_frame_shadow(Gfx::FrameShadow::Sunken);
set_frame_thickness(2);
m_scrollbar = add<GUI::ScrollBar>(Orientation::Vertical);
m_scrollbar->set_relative_rect(0, 0, 16, 0);
m_scrollbar->on_change = [this](int) {