From 477621dd3e1bdafed23aedff42ebd46c8e64bea3 Mon Sep 17 00:00:00 2001 From: Filippo Scognamiglio Date: Mon, 15 Dec 2025 00:20:02 +0100 Subject: [PATCH] Slightly improve the settings layouts. --- app/qml/ApplicationSettings.qml | 2 ++ app/qml/SettingsAdvancedTab.qml | 25 +++++++++++++++++++++++++ app/qml/SettingsEffectsTab.qml | 4 ++++ app/qml/SettingsGeneralTab.qml | 4 ++++ app/qml/SettingsTerminalTab.qml | 23 ++++------------------- app/qml/SettingsWindow.qml | 2 +- 6 files changed, 40 insertions(+), 20 deletions(-) diff --git a/app/qml/ApplicationSettings.qml b/app/qml/ApplicationSettings.qml index 6c138e6..83c404e 100644 --- a/app/qml/ApplicationSettings.qml +++ b/app/qml/ApplicationSettings.qml @@ -31,6 +31,8 @@ QtObject { readonly property real minimumFontScaling: 0.25 readonly property real maximumFontScaling: 2.50 + readonly property int defaultMargin: 16 + readonly property real minBurnInFadeTime: 0.16 readonly property real maxBurnInFadeTime: 1.6 diff --git a/app/qml/SettingsAdvancedTab.qml b/app/qml/SettingsAdvancedTab.qml index 3fe97ce..acc5a07 100644 --- a/app/qml/SettingsAdvancedTab.qml +++ b/app/qml/SettingsAdvancedTab.qml @@ -27,7 +27,9 @@ import "Components" ColumnLayout { GroupBox { Layout.fillWidth: true + Layout.fillHeight: true title: qsTr("Command") + padding: appSettings.defaultMargin ColumnLayout { anchors.fill: parent @@ -60,9 +62,32 @@ ColumnLayout { } } + GroupBox { + title: qsTr("Cursor") + Layout.fillWidth: true + Layout.fillHeight: true + padding: appSettings.defaultMargin + ColumnLayout { + anchors.fill: parent + CheckBox { + id: blinkingCursor + text: qsTr("Blinking Cursor") + checked: appSettings.blinkingCursor + onCheckedChanged: appSettings.blinkingCursor = checked + } + Binding { + target: blinkingCursor + property: "checked" + value: appSettings.blinkingCursor + } + } + } + GroupBox { title: qsTr("Performance") Layout.fillWidth: true + Layout.fillHeight: true + padding: appSettings.defaultMargin GridLayout { anchors.fill: parent columns: 4 diff --git a/app/qml/SettingsEffectsTab.qml b/app/qml/SettingsEffectsTab.qml index cd1f085..b6281f2 100644 --- a/app/qml/SettingsEffectsTab.qml +++ b/app/qml/SettingsEffectsTab.qml @@ -22,11 +22,15 @@ import QtQuick.Controls 2.0 import QtQuick.Layouts 1.1 ColumnLayout { + Layout.fillWidth: true + Layout.fillHeight: true spacing: 2 GroupBox { title: qsTr("Effects") Layout.fillWidth: true + Layout.fillHeight: true + padding: appSettings.defaultMargin ColumnLayout { anchors.fill: parent diff --git a/app/qml/SettingsGeneralTab.qml b/app/qml/SettingsGeneralTab.qml index cf59e19..ea936d2 100644 --- a/app/qml/SettingsGeneralTab.qml +++ b/app/qml/SettingsGeneralTab.qml @@ -25,7 +25,9 @@ import QtQuick.Dialogs ColumnLayout { GroupBox { Layout.fillWidth: true + Layout.fillHeight: true title: qsTr("Profile") + padding: appSettings.defaultMargin RowLayout { anchors.fill: parent ListView { @@ -183,6 +185,8 @@ ColumnLayout { GroupBox { title: qsTr("Screen") Layout.fillWidth: true + Layout.fillHeight: true + padding: appSettings.defaultMargin GridLayout { anchors.fill: parent columns: 2 diff --git a/app/qml/SettingsTerminalTab.qml b/app/qml/SettingsTerminalTab.qml index dc1e129..10820e0 100644 --- a/app/qml/SettingsTerminalTab.qml +++ b/app/qml/SettingsTerminalTab.qml @@ -25,10 +25,11 @@ import QtQml 2.0 import "Components" ColumnLayout { - GroupBox { title: qsTr("Font") Layout.fillWidth: true + Layout.fillHeight: true + padding: appSettings.defaultMargin GridLayout { anchors.fill: parent columns: 2 @@ -149,27 +150,11 @@ ColumnLayout { } } } - GroupBox { - title: qsTr("Cursor") - Layout.fillWidth: true - ColumnLayout { - anchors.fill: parent - CheckBox { - id: blinkingCursor - text: qsTr("Blinking Cursor") - checked: appSettings.blinkingCursor - onCheckedChanged: appSettings.blinkingCursor = checked - } - Binding { - target: blinkingCursor - property: "checked" - value: appSettings.blinkingCursor - } - } - } GroupBox { title: qsTr("Colors") Layout.fillWidth: true + Layout.fillHeight: true + padding: appSettings.defaultMargin ColumnLayout { anchors.fill: parent ColumnLayout { diff --git a/app/qml/SettingsWindow.qml b/app/qml/SettingsWindow.qml index 724a1cb..99ac3c4 100644 --- a/app/qml/SettingsWindow.qml +++ b/app/qml/SettingsWindow.qml @@ -28,7 +28,7 @@ ApplicationWindow { id: settings_window title: qsTr("Settings") width: 640 - height: 640 + height: 480 Item { anchors { fill: parent; }