From 6f90f41516e4fc39ad08ab65520c9aab081c313d Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Fri, 12 Apr 2019 14:47:21 +0200 Subject: [PATCH] VisualBuilder: Add some more GWidget default properties. --- Applications/VisualBuilder/VBPropertiesWindow.cpp | 2 +- Applications/VisualBuilder/VBWidget.cpp | 6 +++++- Applications/VisualBuilder/VBWidgetPropertyModel.cpp | 2 +- Applications/VisualBuilder/VBWidgetRegistry.cpp | 5 +++++ Kernel/init.cpp | 4 ++-- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Applications/VisualBuilder/VBPropertiesWindow.cpp b/Applications/VisualBuilder/VBPropertiesWindow.cpp index 593a339298..5b52afc448 100644 --- a/Applications/VisualBuilder/VBPropertiesWindow.cpp +++ b/Applications/VisualBuilder/VBPropertiesWindow.cpp @@ -7,7 +7,7 @@ VBPropertiesWindow::VBPropertiesWindow() { set_title("Properties"); - set_rect(780, 200, 200, 280); + set_rect(780, 200, 220, 280); auto* widget = new GWidget; widget->set_fill_with_background_color(true); diff --git a/Applications/VisualBuilder/VBWidget.cpp b/Applications/VisualBuilder/VBWidget.cpp index 4ff797462e..89ddec309d 100644 --- a/Applications/VisualBuilder/VBWidget.cpp +++ b/Applications/VisualBuilder/VBWidget.cpp @@ -84,7 +84,11 @@ void VBWidget::synchronize_properties() property_by_name("height")->set_value(m_gwidget->height()); property_by_name("x")->set_value(m_gwidget->x()); property_by_name("y")->set_value(m_gwidget->y()); - + property_by_name("visible")->set_value(m_gwidget->is_visible()); + property_by_name("enabled")->set_value(m_gwidget->is_enabled()); + property_by_name("tooltip")->set_value(m_gwidget->tooltip()); + property_by_name("background_color")->set_value(m_gwidget->background_color()); + property_by_name("foreground_color")->set_value(m_gwidget->foreground_color()); m_property_model->update(); } diff --git a/Applications/VisualBuilder/VBWidgetPropertyModel.cpp b/Applications/VisualBuilder/VBWidgetPropertyModel.cpp index 34b5a09ead..9e2d61c819 100644 --- a/Applications/VisualBuilder/VBWidgetPropertyModel.cpp +++ b/Applications/VisualBuilder/VBWidgetPropertyModel.cpp @@ -29,7 +29,7 @@ String VBWidgetPropertyModel::column_name(int column) const GModel::ColumnMetadata VBWidgetPropertyModel::column_metadata(int column) const { UNUSED_PARAM(column); - return { 80, TextAlignment::CenterLeft }; + return { 90, TextAlignment::CenterLeft }; } GVariant VBWidgetPropertyModel::data(const GModelIndex& index, Role role) const diff --git a/Applications/VisualBuilder/VBWidgetRegistry.cpp b/Applications/VisualBuilder/VBWidgetRegistry.cpp index 2b5722bc21..1251212275 100644 --- a/Applications/VisualBuilder/VBWidgetRegistry.cpp +++ b/Applications/VisualBuilder/VBWidgetRegistry.cpp @@ -86,5 +86,10 @@ GWidget* VBWidgetRegistry::build_gwidget(VBWidgetType type, GWidget* parent, Vec add_property("height"); add_property("x"); add_property("y"); + add_property("visible"); + add_property("enabled"); + add_property("tooltip"); + add_property("background_color"); + add_property("foreground_color"); return gwidget; } diff --git a/Kernel/init.cpp b/Kernel/init.cpp index 5fdc59dcb0..4989d2331a 100644 --- a/Kernel/init.cpp +++ b/Kernel/init.cpp @@ -31,9 +31,9 @@ //#define SPAWN_GUITEST2 //#define SPAWN_FILE_MANAGER //#define SPAWN_PROCESS_MANAGER -#define SPAWN_TEXT_EDITOR +//#define SPAWN_TEXT_EDITOR //#define SPAWN_FONTEDITOR -//#define SPAWN_VISUAL_BUILDER +#define SPAWN_VISUAL_BUILDER //#define SPAWN_MULTIPLE_SHELLS //#define STRESS_TEST_SPAWNING