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
8fa01c9b
Commit
8fa01c9b
authored
Apr 04, 2016
by
Craig Watson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for application not full-screening when unminimized on Cinnamon
parent
ea85856c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
11 deletions
+19
-11
UBApplication.cpp
src/core/UBApplication.cpp
+19
-11
No files found.
src/core/UBApplication.cpp
View file @
8fa01c9b
...
@@ -81,7 +81,7 @@ const QString UBApplication::mimeTypeUniboardPage = QString("application/vnd.mne
...
@@ -81,7 +81,7 @@ const QString UBApplication::mimeTypeUniboardPage = QString("application/vnd.mne
const
QString
UBApplication
::
mimeTypeUniboardPageItem
=
QString
(
"application/vnd.mnemis-uniboard-page-item"
);
const
QString
UBApplication
::
mimeTypeUniboardPageItem
=
QString
(
"application/vnd.mnemis-uniboard-page-item"
);
const
QString
UBApplication
::
mimeTypeUniboardPageThumbnail
=
QString
(
"application/vnd.mnemis-uniboard-thumbnail"
);
const
QString
UBApplication
::
mimeTypeUniboardPageThumbnail
=
QString
(
"application/vnd.mnemis-uniboard-thumbnail"
);
#if
def Q_OS_OSX
#if
defined(Q_OS_OSX) || defined(Q_OS_LINUX)
bool
bIsMinimized
=
false
;
bool
bIsMinimized
=
false
;
#endif
#endif
...
@@ -318,10 +318,10 @@ int UBApplication::exec(const QString& pFileToImport)
...
@@ -318,10 +318,10 @@ int UBApplication::exec(const QString& pFileToImport)
connect
(
mainWindow
->
actionDesktop
,
SIGNAL
(
triggered
(
bool
)),
applicationController
,
SLOT
(
showDesktop
(
bool
)));
connect
(
mainWindow
->
actionDesktop
,
SIGNAL
(
triggered
(
bool
)),
applicationController
,
SLOT
(
showDesktop
(
bool
)));
connect
(
mainWindow
->
actionDesktop
,
SIGNAL
(
triggered
(
bool
)),
this
,
SLOT
(
stopScript
()));
connect
(
mainWindow
->
actionDesktop
,
SIGNAL
(
triggered
(
bool
)),
this
,
SLOT
(
stopScript
()));
#ifndef Q_OS_OSX
#if defined(Q_OS_OSX) || defined(Q_OS_LINUX)
connect
(
mainWindow
->
actionHideApplication
,
SIGNAL
(
triggered
()),
mainWindow
,
SLOT
(
showMinimized
()));
#else
connect
(
mainWindow
->
actionHideApplication
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
showMinimized
()));
connect
(
mainWindow
->
actionHideApplication
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
showMinimized
()));
#else
connect
(
mainWindow
->
actionHideApplication
,
SIGNAL
(
triggered
()),
mainWindow
,
SLOT
(
showMinimized
()));
#endif
#endif
mPreferencesController
=
new
UBPreferencesController
(
mainWindow
);
mPreferencesController
=
new
UBPreferencesController
(
mainWindow
);
...
@@ -369,8 +369,11 @@ void UBApplication::showMinimized()
...
@@ -369,8 +369,11 @@ void UBApplication::showMinimized()
{
{
#ifdef Q_OS_OSX
#ifdef Q_OS_OSX
mainWindow
->
hide
();
mainWindow
->
hide
();
bIsMinimized
=
true
;
#elif defined(Q_OS_LINUX)
mainWindow
->
showMinimized
();
#endif
#endif
bIsMinimized
=
true
;
}
}
...
@@ -580,14 +583,19 @@ bool UBApplication::eventFilter(QObject *obj, QEvent *event)
...
@@ -580,14 +583,19 @@ bool UBApplication::eventFilter(QObject *obj, QEvent *event)
if
(
event
->
type
()
==
QEvent
::
ApplicationActivate
)
if
(
event
->
type
()
==
QEvent
::
ApplicationActivate
)
{
{
boardController
->
controlView
()
->
setMultiselection
(
false
);
boardController
->
controlView
()
->
setMultiselection
(
false
);
}
#ifdef Q_OS_OSX
if
(
bIsMinimized
)
{
if
(
bIsMinimized
&&
event
->
type
()
==
QEvent
::
ApplicationActivate
){
#if defined(Q_OS_OSX)
if
(
mainWindow
->
isHidden
())
mainWindow
->
show
();
if
(
mainWindow
->
isHidden
())
mainWindow
->
show
();
bIsMinimized
=
false
;
bIsMinimized
=
false
;
}
#elif defined(Q_OS_LINUX)
bIsMinimized
=
false
;
UBPlatformUtils
::
showFullScreen
(
mainWindow
);
#endif
#endif
}
}
return
result
;
return
result
;
}
}
...
...
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