diff options
author | Edgar Araújo <edgararaj@gmail.com> | 2021-03-23 16:59:18 +0000 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-03-29 09:10:23 +0200 |
commit | ca90a2029d36e118cf7e9fbc0bdf4eb08b1bde13 (patch) | |
tree | dc085b0a12470eab14851cbecb101576f1d3744f | |
parent | 532e0090fc84e134f50b5b2bef7ad9c1ce4653ff (diff) | |
download | serenity-ca90a2029d36e118cf7e9fbc0bdf4eb08b1bde13.zip |
Everywhere: Change font properties to be described in GML
9 files changed, 7 insertions, 8 deletions
diff --git a/Userland/Applications/Calculator/CalculatorWidget.cpp b/Userland/Applications/Calculator/CalculatorWidget.cpp index f2ae66413a..24e1305770 100644 --- a/Userland/Applications/Calculator/CalculatorWidget.cpp +++ b/Userland/Applications/Calculator/CalculatorWidget.cpp @@ -42,7 +42,6 @@ CalculatorWidget::CalculatorWidget() m_entry = *find_descendant_of_type_named<GUI::TextBox>("entry_textbox"); m_entry->set_relative_rect(5, 5, 244, 26); m_entry->set_text_alignment(Gfx::TextAlignment::CenterRight); - m_entry->set_font(Gfx::FontDatabase::default_fixed_width_font()); m_label = *find_descendant_of_type_named<GUI::Label>("label"); diff --git a/Userland/Applications/Calculator/CalculatorWindow.gml b/Userland/Applications/Calculator/CalculatorWindow.gml index ef5a4051e3..606e988f5a 100644 --- a/Userland/Applications/Calculator/CalculatorWindow.gml +++ b/Userland/Applications/Calculator/CalculatorWindow.gml @@ -9,6 +9,7 @@ @GUI::TextBox { name: "entry_textbox" + font_type: "FixedWidth" } @GUI::Widget { diff --git a/Userland/Applications/Serendipity/SerendipityWidget.cpp b/Userland/Applications/Serendipity/SerendipityWidget.cpp index f101a53877..cd722184d4 100644 --- a/Userland/Applications/Serendipity/SerendipityWidget.cpp +++ b/Userland/Applications/Serendipity/SerendipityWidget.cpp @@ -56,13 +56,9 @@ SerendipityWidget::SerendipityWidget() auto& light_bulb_label = *find_descendant_of_type_named<GUI::Label>("light_bulb_label"); light_bulb_label.set_icon(Gfx::Bitmap::load_from_file("/res/icons/32x32/app-serendipity.png")); - auto& did_you_know_label = *find_descendant_of_type_named<GUI::Label>("did_you_know_label"); - did_you_know_label.set_font(Gfx::BitmapFont::load_from_file("/res/fonts/KaticaBold12.font")); - m_web_view = *find_descendant_of_type_named<Web::OutOfProcessWebView>("web_view"); m_tip_label = *find_descendant_of_type_named<GUI::Label>("tip_label"); - m_tip_label->set_font(Gfx::BitmapFont::load_from_file("/res/fonts/KaticaRegular12.font")); m_next_button = *find_descendant_of_type_named<GUI::Button>("next_button"); m_next_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-forward.png")); diff --git a/Userland/Applications/Serendipity/SerendipityWindow.gml b/Userland/Applications/Serendipity/SerendipityWindow.gml index 249fa08791..4f6b167768 100644 --- a/Userland/Applications/Serendipity/SerendipityWindow.gml +++ b/Userland/Applications/Serendipity/SerendipityWindow.gml @@ -50,12 +50,15 @@ name: "did_you_know_label" text: "Did you know..." text_alignment: "CenterLeft" + font_size: 12 + font_weight: "Bold" } @GUI::Label { name: "tip_label" text_alignment: "TopLeft" word_wrap: true + font_size: 12 } } } diff --git a/Userland/Applications/Spreadsheet/CellTypeDialog.cpp b/Userland/Applications/Spreadsheet/CellTypeDialog.cpp index 9b71a17016..ba4cefa425 100644 --- a/Userland/Applications/Spreadsheet/CellTypeDialog.cpp +++ b/Userland/Applications/Spreadsheet/CellTypeDialog.cpp @@ -427,7 +427,6 @@ ConditionView::ConditionView(ConditionalFormat& fmt) formula_editor.set_syntax_highlighter(make<JS::SyntaxHighlighter>()); formula_editor.set_should_hide_unnecessary_scrollbars(true); - formula_editor.set_font(&Gfx::FontDatabase::default_fixed_width_font()); formula_editor.on_change = [&] { m_format.condition = formula_editor.text(); }; diff --git a/Userland/Applications/Spreadsheet/CondView.gml b/Userland/Applications/Spreadsheet/CondView.gml index c896c4865b..a17e15d14b 100644 --- a/Userland/Applications/Spreadsheet/CondView.gml +++ b/Userland/Applications/Spreadsheet/CondView.gml @@ -15,6 +15,7 @@ name: "formula_editor" fixed_height: 25 tooltip: "Use 'value' to refer to the current cell's value" + font_type: "FixedWidth" } } diff --git a/Userland/Demos/WidgetGallery/GalleryGML/CursorsTab.gml b/Userland/Demos/WidgetGallery/GalleryGML/CursorsTab.gml index e610f819b8..965414eb10 100644 --- a/Userland/Demos/WidgetGallery/GalleryGML/CursorsTab.gml +++ b/Userland/Demos/WidgetGallery/GalleryGML/CursorsTab.gml @@ -11,6 +11,7 @@ @GUI::TableView { name: "cursors_tableview" + font_size: 12 } } } diff --git a/Userland/Demos/WidgetGallery/GalleryGML/IconsTab.gml b/Userland/Demos/WidgetGallery/GalleryGML/IconsTab.gml index d6d1533759..8a3496c799 100644 --- a/Userland/Demos/WidgetGallery/GalleryGML/IconsTab.gml +++ b/Userland/Demos/WidgetGallery/GalleryGML/IconsTab.gml @@ -11,6 +11,7 @@ @GUI::TableView { name: "icons_tableview" + font_size: 12 } } } diff --git a/Userland/Demos/WidgetGallery/GalleryWidget.cpp b/Userland/Demos/WidgetGallery/GalleryWidget.cpp index 3add7b662c..1263106ee2 100644 --- a/Userland/Demos/WidgetGallery/GalleryWidget.cpp +++ b/Userland/Demos/WidgetGallery/GalleryWidget.cpp @@ -306,7 +306,6 @@ GalleryWidget::GalleryWidget() m_cursors_tableview->set_alternating_row_colors(false); m_cursors_tableview->set_vertical_padding(16); m_cursors_tableview->set_column_headers_visible(false); - m_cursors_tableview->set_font(Gfx::BitmapFont::load_from_file("/res/fonts/KaticaRegular12.font")); m_cursors_tableview->set_highlight_key_column(false); auto sorting_proxy_model = GUI::SortingProxyModel::create(MouseCursorModel::create()); @@ -380,7 +379,6 @@ GalleryWidget::GalleryWidget() m_icons_tableview->set_alternating_row_colors(false); m_icons_tableview->set_vertical_padding(24); m_icons_tableview->set_column_headers_visible(false); - m_icons_tableview->set_font(Gfx::BitmapFont::load_from_file("/res/fonts/KaticaRegular12.font")); m_icons_tableview->set_highlight_key_column(false); auto sorting_proxy_icons_model = GUI::SortingProxyModel::create(FileIconsModel::create()); |