From fd905ef30800952310048ce4dbdac47d6126fc01 Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Mon, 26 Dec 2022 19:07:05 +0300 Subject: [PATCH] added margin for scrollbars for almost all flickable elements --- client/ui/qml/Controls/TextAreaType.qml | 2 +- client/ui/qml/Pages/PageServerContainers.qml | 4 ---- client/ui/qml/Pages/PageSetupWizard.qml | 3 ++- client/ui/qml/Pages/PageSetupWizardHighLevel.qml | 3 ++- client/ui/qml/Pages/PageSetupWizardLowLevel.qml | 3 ++- client/ui/qml/Pages/PageSetupWizardMediumLevel.qml | 3 ++- client/ui/qml/Pages/PageSetupWizardVPNMode.qml | 3 ++- client/ui/qml/Pages/PageViewConfig.qml | 3 ++- client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml | 4 ++-- client/ui/qml/Pages/Share/PageShareProtoAmnezia.qml | 3 ++- client/ui/qml/Pages/Share/PageShareProtoCloak.qml | 4 ++-- client/ui/qml/Pages/Share/PageShareProtoIkev2.qml | 3 ++- client/ui/qml/Pages/Share/PageShareProtoOpenVPN.qml | 4 ++-- client/ui/qml/Pages/Share/PageShareProtoShadowSocks.qml | 3 ++- client/ui/qml/Pages/Share/PageShareProtoWireGuard.qml | 3 ++- 15 files changed, 27 insertions(+), 21 deletions(-) diff --git a/client/ui/qml/Controls/TextAreaType.qml b/client/ui/qml/Controls/TextAreaType.qml index 5e83e787..9268cbab 100644 --- a/client/ui/qml/Controls/TextAreaType.qml +++ b/client/ui/qml/Controls/TextAreaType.qml @@ -4,7 +4,7 @@ import Qt.labs.platform 1.0 import "../Config" -Flickable +FlickableType { property alias textArea: root id: flickable diff --git a/client/ui/qml/Pages/PageServerContainers.qml b/client/ui/qml/Pages/PageServerContainers.qml index d61d2a7f..13d61be8 100644 --- a/client/ui/qml/Pages/PageServerContainers.qml +++ b/client/ui/qml/Pages/PageServerContainers.qml @@ -174,10 +174,6 @@ PageBase { } } - - - - FlickableType { visible: container_selector.selectedIndex <= 0 clip: true diff --git a/client/ui/qml/Pages/PageSetupWizard.qml b/client/ui/qml/Pages/PageSetupWizard.qml index b6aab471..073a2c49 100644 --- a/client/ui/qml/Pages/PageSetupWizard.qml +++ b/client/ui/qml/Pages/PageSetupWizard.qml @@ -29,7 +29,7 @@ PageBase { anchors.left: root.left anchors.leftMargin: 30 anchors.right: root.right - anchors.rightMargin: 30 + anchors.rightMargin: 15 contentHeight: content.height clip: true @@ -40,6 +40,7 @@ PageBase { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right + anchors.rightMargin: 15 RadioButtonType { id: radioButton_setup_wizard_high diff --git a/client/ui/qml/Pages/PageSetupWizardHighLevel.qml b/client/ui/qml/Pages/PageSetupWizardHighLevel.qml index bd8c72d6..ab0b6f05 100644 --- a/client/ui/qml/Pages/PageSetupWizardHighLevel.qml +++ b/client/ui/qml/Pages/PageSetupWizardHighLevel.qml @@ -29,7 +29,7 @@ PageBase { anchors.left: root.left anchors.leftMargin: 30 anchors.right: root.right - anchors.rightMargin: 30 + anchors.rightMargin: 15 contentHeight: content.height clip: true @@ -40,6 +40,7 @@ PageBase { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right + anchors.rightMargin: 15 LabelType { Layout.fillWidth: true diff --git a/client/ui/qml/Pages/PageSetupWizardLowLevel.qml b/client/ui/qml/Pages/PageSetupWizardLowLevel.qml index f6c34558..4bc1d09f 100644 --- a/client/ui/qml/Pages/PageSetupWizardLowLevel.qml +++ b/client/ui/qml/Pages/PageSetupWizardLowLevel.qml @@ -29,7 +29,7 @@ PageBase { anchors.left: root.left anchors.leftMargin: 30 anchors.right: root.right - anchors.rightMargin: 30 + anchors.rightMargin: 15 contentHeight: content.height clip: true @@ -40,6 +40,7 @@ PageBase { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right + anchors.rightMargin: 15 LabelType { Layout.fillWidth: true diff --git a/client/ui/qml/Pages/PageSetupWizardMediumLevel.qml b/client/ui/qml/Pages/PageSetupWizardMediumLevel.qml index 21b0e8f8..85050ab6 100644 --- a/client/ui/qml/Pages/PageSetupWizardMediumLevel.qml +++ b/client/ui/qml/Pages/PageSetupWizardMediumLevel.qml @@ -29,7 +29,7 @@ PageBase { anchors.left: root.left anchors.leftMargin: 30 anchors.right: root.right - anchors.rightMargin: 30 + anchors.rightMargin: 15 contentHeight: content.height clip: true @@ -40,6 +40,7 @@ PageBase { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right + anchors.rightMargin: 15 LabelType { Layout.fillWidth: true diff --git a/client/ui/qml/Pages/PageSetupWizardVPNMode.qml b/client/ui/qml/Pages/PageSetupWizardVPNMode.qml index d307aacf..33fa4741 100644 --- a/client/ui/qml/Pages/PageSetupWizardVPNMode.qml +++ b/client/ui/qml/Pages/PageSetupWizardVPNMode.qml @@ -29,7 +29,7 @@ PageBase { anchors.left: root.left anchors.leftMargin: 30 anchors.right: root.right - anchors.rightMargin: 30 + anchors.rightMargin: 15 contentHeight: content.height clip: true @@ -40,6 +40,7 @@ PageBase { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right + anchors.rightMargin: 15 LabelType { Layout.fillWidth: true diff --git a/client/ui/qml/Pages/PageViewConfig.qml b/client/ui/qml/Pages/PageViewConfig.qml index 198e1a09..6fb4323a 100644 --- a/client/ui/qml/Pages/PageViewConfig.qml +++ b/client/ui/qml/Pages/PageViewConfig.qml @@ -30,7 +30,7 @@ PageBase { anchors.left: root.left anchors.leftMargin: 30 anchors.right: root.right - anchors.rightMargin: 30 + anchors.rightMargin: 15 contentHeight: content.height clip: true @@ -41,6 +41,7 @@ PageBase { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right + anchors.rightMargin: 15 TextAreaType { id: ta_config diff --git a/client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml b/client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml index 67a095fb..858ae8aa 100644 --- a/client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml +++ b/client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml @@ -29,7 +29,7 @@ PageProtocolBase { anchors.left: root.left anchors.leftMargin: 30 anchors.right: root.right - anchors.rightMargin: 30 + anchors.rightMargin: 15 contentHeight: content.height clip: true @@ -40,7 +40,7 @@ PageProtocolBase { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right - + anchors.rightMargin: 15 LabelType { id: lb_subnet diff --git a/client/ui/qml/Pages/Share/PageShareProtoAmnezia.qml b/client/ui/qml/Pages/Share/PageShareProtoAmnezia.qml index 9de5d5b3..ca134a52 100644 --- a/client/ui/qml/Pages/Share/PageShareProtoAmnezia.qml +++ b/client/ui/qml/Pages/Share/PageShareProtoAmnezia.qml @@ -28,7 +28,7 @@ PageShareProtocolBase { anchors.left: root.left anchors.leftMargin: 30 anchors.right: root.right - anchors.rightMargin: 30 + anchors.rightMargin: 15 contentHeight: content.height + 20 clip: true @@ -46,6 +46,7 @@ PageShareProtocolBase { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right + anchors.rightMargin: 15 Text { id: lb_desc diff --git a/client/ui/qml/Pages/Share/PageShareProtoCloak.qml b/client/ui/qml/Pages/Share/PageShareProtoCloak.qml index 0ba7d1ee..a5bc78da 100644 --- a/client/ui/qml/Pages/Share/PageShareProtoCloak.qml +++ b/client/ui/qml/Pages/Share/PageShareProtoCloak.qml @@ -28,7 +28,7 @@ PageShareProtocolBase { anchors.left: root.left anchors.leftMargin: 30 anchors.right: root.right - anchors.rightMargin: 30 + anchors.rightMargin: 15 contentHeight: content.height clip: true @@ -39,7 +39,7 @@ PageShareProtocolBase { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right - + anchors.rightMargin: 15 LabelType { id: lb_desc diff --git a/client/ui/qml/Pages/Share/PageShareProtoIkev2.qml b/client/ui/qml/Pages/Share/PageShareProtoIkev2.qml index 1c44b2cb..ea91521b 100644 --- a/client/ui/qml/Pages/Share/PageShareProtoIkev2.qml +++ b/client/ui/qml/Pages/Share/PageShareProtoIkev2.qml @@ -52,7 +52,7 @@ PageShareProtocolBase { anchors.left: root.left anchors.leftMargin: 30 anchors.right: root.right - anchors.rightMargin: 30 + anchors.rightMargin: 15 contentHeight: content.height clip: true @@ -63,6 +63,7 @@ PageShareProtocolBase { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right + anchors.rightMargin: 15 // LabelType { // id: lb_desc diff --git a/client/ui/qml/Pages/Share/PageShareProtoOpenVPN.qml b/client/ui/qml/Pages/Share/PageShareProtoOpenVPN.qml index 67a91775..b7d31c37 100644 --- a/client/ui/qml/Pages/Share/PageShareProtoOpenVPN.qml +++ b/client/ui/qml/Pages/Share/PageShareProtoOpenVPN.qml @@ -28,7 +28,7 @@ PageShareProtocolBase { anchors.left: root.left anchors.leftMargin: 30 anchors.right: root.right - anchors.rightMargin: 30 + anchors.rightMargin: 15 contentHeight: content.height clip: true @@ -39,7 +39,7 @@ PageShareProtocolBase { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right - + anchors.rightMargin: 15 LabelType { id: lb_desc diff --git a/client/ui/qml/Pages/Share/PageShareProtoShadowSocks.qml b/client/ui/qml/Pages/Share/PageShareProtoShadowSocks.qml index 9956609b..c0d905d1 100644 --- a/client/ui/qml/Pages/Share/PageShareProtoShadowSocks.qml +++ b/client/ui/qml/Pages/Share/PageShareProtoShadowSocks.qml @@ -28,7 +28,7 @@ PageShareProtocolBase { anchors.left: root.left anchors.leftMargin: 30 anchors.right: root.right - anchors.rightMargin: 30 + anchors.rightMargin: 15 contentHeight: content.height clip: true @@ -39,6 +39,7 @@ PageShareProtocolBase { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right + anchors.rightMargin: 15 LabelType { id: lb_desc diff --git a/client/ui/qml/Pages/Share/PageShareProtoWireGuard.qml b/client/ui/qml/Pages/Share/PageShareProtoWireGuard.qml index f9f98a6a..db370cf1 100644 --- a/client/ui/qml/Pages/Share/PageShareProtoWireGuard.qml +++ b/client/ui/qml/Pages/Share/PageShareProtoWireGuard.qml @@ -28,7 +28,7 @@ PageShareProtocolBase { anchors.left: root.left anchors.leftMargin: 30 anchors.right: root.right - anchors.rightMargin: 30 + anchors.rightMargin: 15 contentHeight: content.height clip: true @@ -39,6 +39,7 @@ PageShareProtocolBase { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right + anchors.rightMargin: 15 LabelType { id: lb_desc