Skip to content
Snippets Groups Projects
Commit 3b00b422 authored by Aline Gondim Santos's avatar Aline Gondim Santos
Browse files

RTL: fix sparse side panel options

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

GitLab: #1290
Change-Id: I458e6a96e496b35b7659c5a061949f135511a2e4
parent 21f3479a
No related branches found
No related tags found
No related merge requests found
......@@ -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
}
}
......@@ -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
......
......@@ -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;
......
......@@ -226,7 +226,7 @@ SidePanelBase {
ListView {
id: childListView
width: parent.width
Layout.fillWidth: true
height: childrenRect.height
clip: true
visible: isChildSelected
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment