beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 23:50:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

ThemeEditor: Update GML and polish interface

Browse source 
Registers the PreviewWidget for addition directly into GML. Fixes
its previous double Frame borders. Also standardizes the Apply and
Reset buttons as DialogButtons and spaces them consistently with
other apps. Gives the TabWidget some tasteful container margins.
This commit is contained in:
thankyouverycool 2022-09-26 08:58:00 -04:00 committed by Andreas Kling
parent e99277611b
commit d444724d24
Notes: sideshowbarker 2024-07-17 04:22:11 +09:00 
Author: https://github.com/thankyouverycool
Commit: https://github.com/SerenityOS/serenity/commit/d444724d24
Pull-request: https://github.com/SerenityOS/serenity/pull/16106
4 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Userland/Applications/ThemeEditor/MainWidget.cpp
View file

@ -17,7 +17,6 @@
#include <Applications/ThemeEditor/ThemeEditorGML.h> #include <Applications/ThemeEditor/ThemeEditorGML.h>
#include <LibFileSystemAccessClient/Client.h> #include <LibFileSystemAccessClient/Client.h>
#include <LibGUI/ActionGroup.h> #include <LibGUI/ActionGroup.h>
#include <LibGUI/Application.h>
#include <LibGUI/BoxLayout.h> #include <LibGUI/BoxLayout.h>
#include <LibGUI/Button.h> #include <LibGUI/Button.h>
#include <LibGUI/ConnectionToWindowServer.h> #include <LibGUI/ConnectionToWindowServer.h>
@ -191,8 +190,7 @@ MainWidget::MainWidget()
m_alignment_model = MUST(AlignmentModel::try_create()); m_alignment_model = MUST(AlignmentModel::try_create());
m_preview_widget = find_descendant_of_type_named<GUI::Frame>("preview_frame") m_preview_widget = find_descendant_of_type_named<ThemeEditor::PreviewWidget>("preview_widget");
->add<ThemeEditor::PreviewWidget>(m_current_palette);
m_property_tabs = find_descendant_of_type_named<GUI::TabWidget>("property_tabs"); m_property_tabs = find_descendant_of_type_named<GUI::TabWidget>("property_tabs");
add_property_tab(window_tab); add_property_tab(window_tab);
add_property_tab(widgets_tab); add_property_tab(widgets_tab);
@ -371,8 +369,8 @@ void MainWidget::build_override_controls()
{ {
auto* theme_override_controls = find_descendant_of_type_named<GUI::Widget>("theme_override_controls"); auto* theme_override_controls = find_descendant_of_type_named<GUI::Widget>("theme_override_controls");
m_theme_override_apply = theme_override_controls->find_child_of_type_named<GUI::Button>("apply"); m_theme_override_apply = theme_override_controls->find_child_of_type_named<GUI::DialogButton>("apply_button");
m_theme_override_reset = theme_override_controls->find_child_of_type_named<GUI::Button>("reset"); m_theme_override_reset = theme_override_controls->find_child_of_type_named<GUI::DialogButton>("reset_button");
m_theme_override_apply->on_click = [&](auto) { m_theme_override_apply->on_click = [&](auto) {
auto encoded = encode(); auto encoded = encode();

2
Userland/Applications/ThemeEditor/PreviewWidget.cpp
View file

@ -18,6 +18,8 @@
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/WindowTheme.h> #include <LibGfx/WindowTheme.h>
REGISTER_WIDGET(ThemeEditor, PreviewWidget);
namespace ThemeEditor { namespace ThemeEditor {
class MiniWidgetGallery final : public GUI::Widget { class MiniWidgetGallery final : public GUI::Widget {

1
Userland/Applications/ThemeEditor/PreviewWidget.h
View file

@ -10,6 +10,7 @@
#pragma once #pragma once
#include <LibGUI/AbstractThemePreview.h> #include <LibGUI/AbstractThemePreview.h>
#include <LibGUI/Application.h>
#include <LibGUI/ColorFilterer.h> #include <LibGUI/ColorFilterer.h>
#include <LibGUI/Frame.h> #include <LibGUI/Frame.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>

33
Userland/Applications/ThemeEditor/ThemeEditor.gml
View file

@ -1,41 +1,44 @@
@GUI::Widget { @GUI::Widget {
layout: @GUI::VerticalBoxLayout {} layout: @GUI::VerticalBoxLayout {
margins: [0, 4, 4]
spacing: 6
}
fill_with_background_color: true fill_with_background_color: true
@GUI::Widget { @GUI::Widget {
layout: @GUI::HorizontalBoxLayout {} layout: @GUI::HorizontalBoxLayout {
spacing: 4
}
@GUI::Frame { @ThemeEditor::PreviewWidget {
layout: @GUI::HorizontalBoxLayout {} name: "preview_widget"
name: "preview_frame"
} }
@GUI::TabWidget { @GUI::TabWidget {
name: "property_tabs" name: "property_tabs"
container_margins: [5]
} }
} }
@GUI::Widget { @GUI::Widget {
name: "theme_override_controls" name: "theme_override_controls"
layout: @GUI::HorizontalBoxLayout { layout: @GUI::HorizontalBoxLayout {
margins: [0, 4] spacing: 6
} }
fixed_height: 30 preferred_height: "shrink"
@GUI::Layout::Spacer {} @GUI::Layout::Spacer {}
@GUI::Button { @GUI::DialogButton {
name: "reset" name: "reset_button"
text: "Reset to Previous System Theme" text: "Reset"
enabled: false enabled: false
fixed_width: 190
} }
@GUI::Button { @GUI::DialogButton {
name: "apply" name: "apply_button"
text: "Apply as System Theme" text: "Apply"
enabled: false enabled: false
fixed_width: 140
} }
} }
} }