mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-19 20:48:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(ui/views/App/Main/MainWindow): handle closing correctly on mac os

Browse source
This commit is contained in:
Ronan Abhamon 2017-04-26 09:37:01 +02:00
parent 4dcb43092b
commit e482fb9e1c
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
linphone-desktop/ui/modules/Common/Form/Fields/TextAreaField.qml
View file

@ -10,9 +10,14 @@ Flickable {
property alias text: textArea.text
readonly property alias length: textArea.length
boundsBehavior: Flickable.StopAtBounds
height: TextAreaFieldStyle.background.height
width: TextAreaFieldStyle.background.width
ScrollBar.vertical: ForceScrollBar {
id: scrollBar
}
TextArea.flickable: TextArea {
id: textArea
@ -39,8 +44,4 @@ Flickable {
rightPadding: TextAreaFieldStyle.text.padding + Number(scrollBar.visible) * scrollBar.width
topPadding: TextAreaFieldStyle.text.padding
}
ScrollBar.vertical: ForceScrollBar {
id: scrollBar
}
}

7
linphone-desktop/ui/views/App/Main/MainWindow.js
View file

@ -16,6 +16,13 @@ function handleActiveFocusItemChanged (activeFocusItem) {
}
}
function handleClosing (close) {
if (Qt.platform.os === 'osx') {
close.accepted = false
window.showMinimized()
}
}
// -----------------------------------------------------------------------------
function lockView (info) {

1
linphone-desktop/ui/views/App/Main/MainWindow.qml
View file

@ -54,6 +54,7 @@ ApplicationWindow {
// ---------------------------------------------------------------------------
onActiveFocusItemChanged: Logic.handleActiveFocusItemChanged(activeFocusItem)
onClosing: Logic.handleClosing(close)
// ---------------------------------------------------------------------------