Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-client-windows
Commits
e77c49a8
Commit
e77c49a8
authored
Feb 25, 2019
by
Andreas Traczyk
Browse files
mainwindow: don't resize window when an update is found
Change-Id: Iceee8398d7978b7534dcda74746a0d73642e4354
parent
cd06f584
Changes
2
Hide whitespace changes
Inline
Side-by-side
mainwindow.cpp
View file @
e77c49a8
...
...
@@ -102,8 +102,8 @@ MainWindow::MainWindow(QWidget* parent) :
win_sparkle_set_appcast_url
(
"https://dl.ring.cx/windows/winsparkle-ring.xml"
);
win_sparkle_set_app_details
(
L"Savoir-faire Linux"
,
L"Jami"
,
QString
(
VERSION_STRING
).
toStdWString
().
c_str
());
win_sparkle_set_shutdown_request_callback
([]()
{
QCoreApplication
::
exit
();});
win_sparkle_set_did_find_update_callback
([]()
{
MainWindow
::
instance
().
show
Normal
();});
win_sparkle_set_shutdown_request_callback
([]()
{
QCoreApplication
::
exit
();
});
win_sparkle_set_did_find_update_callback
([]()
{
MainWindow
::
instance
().
show
Window
();
});
win_sparkle_init
();
if
(
win_sparkle_get_last_check_time
()
==
-
1
)
{
...
...
@@ -224,7 +224,7 @@ MainWindow::trayActivated(QSystemTrayIcon::ActivationReason reason)
}
void
MainWindow
::
notificationClicked
()
{
MainWindow
::
showWindow
()
{
if
(
currentWindowState_
==
Qt
::
WindowMaximized
)
{
showMaximized
();
}
else
{
...
...
@@ -234,6 +234,11 @@ MainWindow::notificationClicked() {
raise
();
}
void
MainWindow
::
notificationClicked
()
{
showWindow
();
}
void
MainWindow
::
createThumbBar
()
{
...
...
mainwindow.h
View file @
e77c49a8
...
...
@@ -76,6 +76,7 @@ private:
explicit
MainWindow
(
QWidget
*
parent
=
0
);
~
MainWindow
();
void
showWindow
();
void
setWindowSize
(
ScreenEnum
scr
,
bool
firstUse
=
false
);
ScreenEnum
lastScr_
;
int
lastAccountCount_
;
...
...
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