Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
e482fb9e
Commit
e482fb9e
authored
Apr 26, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ui/views/App/Main/MainWindow): handle closing correctly on mac os
parent
4dcb4309
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
4 deletions
+13
-4
TextAreaField.qml
...e-desktop/ui/modules/Common/Form/Fields/TextAreaField.qml
+5
-4
MainWindow.js
linphone-desktop/ui/views/App/Main/MainWindow.js
+7
-0
MainWindow.qml
linphone-desktop/ui/views/App/Main/MainWindow.qml
+1
-0
No files found.
linphone-desktop/ui/modules/Common/Form/Fields/TextAreaField.qml
View file @
e482fb9e
...
...
@@ -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
}
}
linphone-desktop/ui/views/App/Main/MainWindow.js
View file @
e482fb9e
...
...
@@ -16,6 +16,13 @@ function handleActiveFocusItemChanged (activeFocusItem) {
}
}
function
handleClosing
(
close
)
{
if
(
Qt
.
platform
.
os
===
'
osx
'
)
{
close
.
accepted
=
false
window
.
showMinimized
()
}
}
// -----------------------------------------------------------------------------
function
lockView
(
info
)
{
...
...
linphone-desktop/ui/views/App/Main/MainWindow.qml
View file @
e482fb9e
...
...
@@ -54,6 +54,7 @@ ApplicationWindow {
// ---------------------------------------------------------------------------
onActiveFocusItemChanged
:
Logic
.
handleActiveFocusItemChanged
(
activeFocusItem
)
onClosing
:
Logic
.
handleClosing
(
close
)
// ---------------------------------------------------------------------------
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment