lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-07-19 15:05:40 +02:00
Code Activity

RTL: fix sparse side panel options

Browse source 
+ fix splitview width resize
+ fix tips row in the WelcomePage

GitLab: #1290
Change-Id: I458e6a96e496b35b7659c5a061949f135511a2e4
This commit is contained in:
Aline Gondim Santos 2023-08-03 10:49:09 -03:00
parent 21f3479a96
commit 3b00b42213
4 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/app/commoncomponents/DualPaneView.qml
View file

@ -85,10 +85,12 @@ BaseView {
clip: true
required property bool isMinorPane
onWidthChanged: {
if (!isSinglePane && ((isRTL && !isMinorPane) || (!isRTL && isMinorPane)))
if (!isSinglePane && isMinorPane)
previousMinorPaneWidth = width
if (!isSinglePane && ((isRTL && isMinorPane) || (!isRTL && !isMinorPane)))
if (!isSinglePane && !isMinorPane)
previousMajorPaneWidth = width
if (isMinorPane)
JamiTheme.currentLeftPaneWidth = width
}
Connections {
@ -101,8 +103,9 @@ BaseView {
}
}
SplitView.minimumWidth: isSinglePane ? viewNode.width : (isMinorPane && !isRTL ? minorPaneMinWidth : majorPaneMinWidth)
SplitView.maximumWidth: isSinglePane ? viewNode.width : viewNode.width - (isMinorPane && !isRTL ? majorPaneMinWidth : minorPaneMinWidth)
SplitView.preferredWidth: isMinorPane && !isRTL ? minorPaneMinWidth : majorPaneMinWidth
SplitView.minimumWidth: isSinglePane ? undefined : (isMinorPane ? minorPaneMinWidth : majorPaneMinWidth)
SplitView.maximumWidth: isSinglePane || !isMinorPane ? undefined : Math.abs(viewNode.width - majorPaneMinWidth)
SplitView.preferredWidth: isSinglePane || !isMinorPane ? undefined : JamiTheme.currentLeftPaneWidth
SplitView.fillWidth: !isMinorPane || isSinglePane
}
}

1
src/app/constant/JamiTheme.qml
View file

@ -307,6 +307,7 @@ Item {
// Sizes
property real mainViewLeftPaneMinWidth: 300
property real currentLeftPaneWidth: mainViewLeftPaneMinWidth
property real mainViewPaneMinWidth: 490
property real qrCodeImageSize: 256
property real splitViewHandlePreferredWidth: 4

6
src/app/mainview/components/TipsRow.qml
View file

@ -59,7 +59,7 @@ JamiFlickable {
type: Type
property bool hideTipBox: false
anchors.bottom: row.bottom
textColor:tipsTextColor
textColor: tipsTextColor
iconColor: tipsRow.iconColor
visible: {
@ -74,14 +74,14 @@ JamiFlickable {
}
enabled: {
if (x >= tipsRow.width)
if (x > tipsRow.width || x < tipsRow.x )
return false;
else
return true;
}
opacity: {
if (x >= tipsRow.width)
if (x > tipsRow.width || x < tipsRow.x )
return 0;
else
return 1;

2
src/app/settingsview/SettingsSidePanel.qml
View file

@ -226,7 +226,7 @@ SidePanelBase {
ListView {
id: childListView
width: parent.width
Layout.fillWidth: true
height: childrenRect.height
clip: true
visible: isChildSelected