diff --git a/Applications/Browser/Tab.cpp b/Applications/Browser/Tab.cpp index aebb7948b0..ee38b8e010 100644 --- a/Applications/Browser/Tab.cpp +++ b/Applications/Browser/Tab.cpp @@ -112,7 +112,6 @@ Tab::Tab(Type type) toolbar.add_action(*m_reload_action); m_location_box = toolbar.add(); - m_location_box->set_fixed_height(22); m_location_box->set_placeholder("Address"); m_location_box->on_return_pressed = [this] { diff --git a/Applications/DisplaySettings/DisplaySettings.cpp b/Applications/DisplaySettings/DisplaySettings.cpp index 70a2a7f265..670cdec431 100644 --- a/Applications/DisplaySettings/DisplaySettings.cpp +++ b/Applications/DisplaySettings/DisplaySettings.cpp @@ -116,7 +116,6 @@ void DisplaySettingsWidget::create_frame() wallpaper_label.set_text("Wallpaper:"); m_wallpaper_combo = wallpaper_selection_container.add(); - m_wallpaper_combo->set_fixed_height(22); m_wallpaper_combo->set_only_allow_values_from_model(true); m_wallpaper_combo->set_model(*GUI::ItemListModel::create(m_wallpapers)); m_wallpaper_combo->on_change = [this](auto& text, const GUI::ModelIndex& index) { @@ -170,7 +169,6 @@ void DisplaySettingsWidget::create_frame() mode_label.set_text("Mode:"); m_mode_combo = mode_selection_container.add(); - m_mode_combo->set_fixed_height(22); m_mode_combo->set_only_allow_values_from_model(true); m_mode_combo->set_model(*GUI::ItemListModel::create(m_modes)); m_mode_combo->on_change = [this](auto&, const GUI::ModelIndex& index) { @@ -190,7 +188,6 @@ void DisplaySettingsWidget::create_frame() m_resolution_label.set_text("Resolution:"); m_resolution_combo = resolution_selection_container.add(); - m_resolution_combo->set_fixed_height(22); m_resolution_combo->set_only_allow_values_from_model(true); m_resolution_combo->set_model(*GUI::ItemListModel::create(m_resolutions)); m_resolution_combo->on_change = [this](auto&, const GUI::ModelIndex& index) { diff --git a/Applications/FileManager/PropertiesDialog.cpp b/Applications/FileManager/PropertiesDialog.cpp index 91310d31bc..a2fcf365ab 100644 --- a/Applications/FileManager/PropertiesDialog.cpp +++ b/Applications/FileManager/PropertiesDialog.cpp @@ -76,7 +76,6 @@ PropertiesDialog::PropertiesDialog(const String& path, bool disable_rename, Wind m_parent_path = lexical_path.dirname(); m_name_box = file_container.add(); - m_name_box->set_fixed_height(22); m_name_box->set_text(m_name); m_name_box->set_mode(disable_rename ? GUI::TextBox::Mode::DisplayOnly : GUI::TextBox::Mode::Editable); m_name_box->on_change = [&]() { diff --git a/Applications/FontEditor/FontEditor.cpp b/Applications/FontEditor/FontEditor.cpp index 1b291daf97..25e3479346 100644 --- a/Applications/FontEditor/FontEditor.cpp +++ b/Applications/FontEditor/FontEditor.cpp @@ -72,7 +72,6 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr&& edite glyph_width_label.set_text("Glyph width:"); auto& glyph_width_spinbox = editor_container.add(); - glyph_width_spinbox.set_fixed_height(22); glyph_width_spinbox.set_min(0); glyph_width_spinbox.set_max(32); glyph_width_spinbox.set_value(0); @@ -253,7 +252,6 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr&& edite //// Fixed checkbox Row auto& fixed_width_checkbox = font_metadata_group_box.add(); - fixed_width_checkbox.set_fixed_height(22); fixed_width_checkbox.set_text("Fixed width"); fixed_width_checkbox.set_checked(m_edited_font->is_fixed_width()); diff --git a/Applications/KeyboardSettings/main.cpp b/Applications/KeyboardSettings/main.cpp index d408afe707..d45b631398 100644 --- a/Applications/KeyboardSettings/main.cpp +++ b/Applications/KeyboardSettings/main.cpp @@ -134,7 +134,6 @@ int main(int argc, char** argv) character_map_file_label.set_text("Character Mapping File:"); auto& character_map_file_combo = character_map_file_selection_container.add(); - character_map_file_combo.set_fixed_height(22); character_map_file_combo.set_only_allow_values_from_model(true); character_map_file_combo.set_model(*CharacterMapFileListModel::create(character_map_files)); character_map_file_combo.set_selected_index(initial_keymap_index); diff --git a/Applications/Terminal/main.cpp b/Applications/Terminal/main.cpp index 51f111deb2..9d343e8029 100644 --- a/Applications/Terminal/main.cpp +++ b/Applications/Terminal/main.cpp @@ -299,9 +299,7 @@ static RefPtr create_find_window(TerminalWidget& terminal) }; auto& match_case = search.add("Case sensitive"); - match_case.set_fixed_height(22); auto& wrap_around = search.add("Wrap around"); - wrap_around.set_fixed_height(22); find_backwards.on_click = [&](auto) { auto needle = find_textbox.text(); diff --git a/Demos/DynamicObject/main.cpp b/Demos/DynamicObject/main.cpp index d4f03ae5ac..dac2bb9617 100644 --- a/Demos/DynamicObject/main.cpp +++ b/Demos/DynamicObject/main.cpp @@ -68,7 +68,6 @@ int main([[maybe_unused]] int argc, [[maybe_unused]] char** argv, [[maybe_unused auto& button = main_widget.add(); button.set_text("Good-bye"); - button.set_fixed_height(20); button.on_click = [&](auto) { app->quit(); }; diff --git a/Demos/HelloWorld/main.cpp b/Demos/HelloWorld/main.cpp index da30d56554..0413c0bedd 100644 --- a/Demos/HelloWorld/main.cpp +++ b/Demos/HelloWorld/main.cpp @@ -68,7 +68,6 @@ int main(int argc, char** argv) auto& button = main_widget.add(); button.set_text("Good-bye"); - button.set_fixed_height(20); button.on_click = [&](auto) { app->quit(); }; diff --git a/Demos/WidgetGallery/main.cpp b/Demos/WidgetGallery/main.cpp index 395db79396..284d86bf1c 100644 --- a/Demos/WidgetGallery/main.cpp +++ b/Demos/WidgetGallery/main.cpp @@ -175,9 +175,11 @@ int main(int argc, char** argv) auto& checkbox2 = checkbox_container.add("CheckBox 2"); checkbox2.set_enabled(false); - [[maybe_unused]] auto& label1 = label_container.add("Label 1"); + auto& label1 = label_container.add("Label 1"); + label1.set_fixed_height(22); auto& label2 = label_container.add("Label 2"); label2.set_enabled(false); + label2.set_fixed_height(22); [[maybe_unused]] auto& spinbox1 = spin_container.add(); auto& spinbox2 = spin_container.add(); @@ -424,7 +426,6 @@ int main(int argc, char** argv) content_textbox.set_text("Demo text for message box."); auto& msgbox_button = msgbox_text_container.add("Create"); - msgbox_button.set_fixed_height(30); msgbox_button.on_click = [&](auto) { GUI::MessageBox::show(window, content_textbox.text(), title_textbox.text(), msg_box_type, msg_box_input_type); }; @@ -446,7 +447,6 @@ int main(int argc, char** argv) input_button_container.layout()->set_margins({ 4, 0, 4, 0 }); auto& input_button = input_button_container.add("Input..."); - input_button.set_fixed_height(30); String value; input_button.on_click = [&](auto) { if (GUI::InputBox::show(value, window, "Enter input:", "Input Box") == GUI::InputBox::ExecOK && !value.is_empty()) diff --git a/Libraries/LibGUI/Button.cpp b/Libraries/LibGUI/Button.cpp index c442f04105..670e481c85 100644 --- a/Libraries/LibGUI/Button.cpp +++ b/Libraries/LibGUI/Button.cpp @@ -38,6 +38,7 @@ namespace GUI { Button::Button(String text) : AbstractButton(move(text)) { + set_fixed_height(22); set_focus_policy(GUI::FocusPolicy::StrongFocus); } diff --git a/Libraries/LibGUI/CheckBox.cpp b/Libraries/LibGUI/CheckBox.cpp index 70c98f0e25..ae14f1ca90 100644 --- a/Libraries/LibGUI/CheckBox.cpp +++ b/Libraries/LibGUI/CheckBox.cpp @@ -39,6 +39,7 @@ static const int s_box_height = 13; CheckBox::CheckBox(String text) : AbstractButton(move(text)) { + set_fixed_height(22); } CheckBox::~CheckBox() diff --git a/Libraries/LibGUI/ColorInput.cpp b/Libraries/LibGUI/ColorInput.cpp index 1dae9398a2..76a93ee089 100644 --- a/Libraries/LibGUI/ColorInput.cpp +++ b/Libraries/LibGUI/ColorInput.cpp @@ -35,6 +35,7 @@ namespace GUI { ColorInput::ColorInput() : TextEditor(TextEditor::SingleLine) { + set_fixed_height(22); TextEditor::on_change = [this] { auto parsed_color = Color::from_string(text()); if (parsed_color.has_value()) diff --git a/Libraries/LibGUI/ComboBox.cpp b/Libraries/LibGUI/ComboBox.cpp index 8e68432c1e..0c07cfc57c 100644 --- a/Libraries/LibGUI/ComboBox.cpp +++ b/Libraries/LibGUI/ComboBox.cpp @@ -58,6 +58,8 @@ private: ComboBox::ComboBox() { + set_fixed_height(22); + m_editor = add(); m_editor->set_frame_thickness(0); m_editor->on_return_pressed = [this] { diff --git a/Libraries/LibGUI/FilePicker.cpp b/Libraries/LibGUI/FilePicker.cpp index 1b2fcd1360..3d21f7a963 100644 --- a/Libraries/LibGUI/FilePicker.cpp +++ b/Libraries/LibGUI/FilePicker.cpp @@ -113,7 +113,6 @@ FilePicker::FilePicker(Window* parent_window, Mode mode, Options options, const toolbar.set_has_frame(false); m_location_textbox = upper_container.add(); - m_location_textbox->set_fixed_height(22); m_location_textbox->set_text(path); m_view = vertical_container.add(); diff --git a/Libraries/LibGUI/RadioButton.cpp b/Libraries/LibGUI/RadioButton.cpp index b04052fe18..7a854a3530 100644 --- a/Libraries/LibGUI/RadioButton.cpp +++ b/Libraries/LibGUI/RadioButton.cpp @@ -36,6 +36,7 @@ namespace GUI { RadioButton::RadioButton(String text) : AbstractButton(move(text)) { + set_fixed_height(22); } RadioButton::~RadioButton() diff --git a/Libraries/LibGUI/SpinBox.cpp b/Libraries/LibGUI/SpinBox.cpp index e1d797f1bc..390d2c7011 100644 --- a/Libraries/LibGUI/SpinBox.cpp +++ b/Libraries/LibGUI/SpinBox.cpp @@ -32,6 +32,7 @@ namespace GUI { SpinBox::SpinBox() { + set_fixed_height(22); m_editor = add(); m_editor->set_text("0"); m_editor->on_change = [this] { diff --git a/Libraries/LibGUI/TextBox.cpp b/Libraries/LibGUI/TextBox.cpp index 6274470213..4dcede826a 100644 --- a/Libraries/LibGUI/TextBox.cpp +++ b/Libraries/LibGUI/TextBox.cpp @@ -31,6 +31,7 @@ namespace GUI { TextBox::TextBox() : TextEditor(TextEditor::SingleLine) { + set_fixed_height(22); } TextBox::~TextBox()