Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenBoard
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
lifo
Nicolas Ollinger
OpenBoard
Commits
27b93bb2
Commit
27b93bb2
authored
May 23, 2011
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed issue Sankore-9. setHidden() doesn't behave as expected on mac
parent
735de5af
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
1 deletion
+19
-1
UBApplication.cpp
src/core/UBApplication.cpp
+16
-1
UBApplication.h
src/core/UBApplication.h
+3
-0
No files found.
src/core/UBApplication.cpp
View file @
27b93bb2
...
...
@@ -223,8 +223,12 @@ int UBApplication::exec(const QString& pFileToImport)
applicationController
=
new
UBApplicationController
(
boardController
->
controlView
(),
boardController
->
displayView
(),
mainWindow
,
staticMemoryCleaner
);
connect
(
mainWindow
->
actionDesktop
,
SIGNAL
(
triggered
(
bool
)),
applicationController
,
SLOT
(
showDesktop
(
bool
)));
#ifndef Q_WS_MAC
connect
(
mainWindow
->
actionHideApplication
,
SIGNAL
(
triggered
()),
mainWindow
,
SLOT
(
showMinimized
()));
#else
connect
(
mainWindow
->
actionHideApplication
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
showMinimized
()));
#endif
mPreferencesController
=
new
UBPreferencesController
(
mainWindow
);
connect
(
mainWindow
->
actionPreferences
,
SIGNAL
(
triggered
()),
mPreferencesController
,
SLOT
(
show
()));
...
...
@@ -300,7 +304,13 @@ int UBApplication::exec(const QString& pFileToImport)
return
QApplication
::
exec
();
}
#ifdef Q_WS_MAC
void
UBApplication
::
showMinimized
()
{
mainWindow
->
hide
();
}
#endif
void
UBApplication
::
showBoard
()
{
...
...
@@ -485,6 +495,11 @@ bool UBApplication::eventFilter(QObject *obj, QEvent *event)
boardController
->
controlView
()
->
forcedTabletRelease
();
}
#ifdef Q_WS_MAC
if
(
event
->
type
()
==
QEvent
::
ApplicationActivate
){
if
(
mainWindow
->
isHidden
())
mainWindow
->
show
();
}
#endif
return
result
;
}
...
...
src/core/UBApplication.h
View file @
27b93bb2
...
...
@@ -99,6 +99,9 @@ class UBApplication : public QtSingleApplication
private
slots
:
void
closing
();
#ifdef Q_WS_MAC
void
showMinimized
();
#endif
private
:
...
...
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