d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-29 14:18:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Properly set position of resize handler after letting it go

Browse source 
fixes #817
fixes sidebar not staying small after restart
This commit is contained in:
Nicolas Werner 2021-12-11 20:47:41 +01:00
parent 5c1cc7d5c6
commit d36ba00ff6
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/ChatPage.qml
View file

@ -85,7 +85,9 @@ Rectangle {
id: roomListC id: roomListC
minimumWidth: roomlist.avatarSize * 4 + Nheko.paddingSmall * 2 minimumWidth: roomlist.avatarSize * 4 + Nheko.paddingSmall * 2
preferredWidth: Settings.roomListWidth >= minimumWidth ? Settings.roomListWidth : roomlist.avatarSize * 5 + Nheko.paddingSmall * 2 preferredWidth: (Settings.roomListWidth == - 1)
? (roomlist.avatarSize * 5 + Nheko.paddingSmall * 2)
: (Settings.roomListWidth >= minimumWidth ? Settings.roomListWidth : collapsedWidth)
maximumWidth: roomlist.avatarSize * 10 + Nheko.paddingSmall * 2 maximumWidth: roomlist.avatarSize * 10 + Nheko.paddingSmall * 2
collapsedWidth: roomlist.avatarSize + 2 * Nheko.paddingMedium collapsedWidth: roomlist.avatarSize + 2 * Nheko.paddingMedium

7
resources/qml/components/AdaptiveLayout.qml
View file

@ -82,7 +82,6 @@ Container {
return (collapsible && x < minimumWidth) ? collapsedWidth : x; return (collapsible && x < minimumWidth) ? collapsedWidth : x;
} }
//visible: !container.singlePageMode
enabled: !container.singlePageMode enabled: !container.singlePageMode
height: container.height height: container.height
width: 1 width: 1
@ -107,8 +106,10 @@ Container {
margin: container.splitterGrabMargin margin: container.splitterGrabMargin
grabPermissions: PointerHandler.CanTakeOverFromAnything | PointerHandler.ApprovesTakeOverByHandlersOfSameType grabPermissions: PointerHandler.CanTakeOverFromAnything | PointerHandler.ApprovesTakeOverByHandlersOfSameType
onActiveChanged: { onActiveChanged: {
if (!active) if (!active) {
splitter.parent.preferredWidth = splitter.x; splitter.x = splitter.calculatedWidth;
splitter.parent.preferredWidth = splitter.calculatedWidth;
}
} }
} }