mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

fixed custom context menu for os x, fixed file drag-n-drop in os x 10.10

Browse Source
This commit is contained in:
John Preston
2014-09-30 07:13:47 -07:00
parent 0d85f91453
commit 1fd25e8778
9 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/window.cpp
View File

@@ -787,7 +787,7 @@ void Window::setupTrayIcon() {
}
void Window::updateTrayMenu(bool force) {
if (!trayIconMenu || cPlatform() == dbipWindows && !force) return;
if (!trayIconMenu || (cPlatform() == dbipWindows && !force)) return;
bool active = psIsActive();
QAction *first = trayIconMenu->actions().at(0);
@@ -869,7 +869,7 @@ void Window::showFromTray(QSystemTrayIcon::ActivationReason reason) {
}
void Window::toggleTray(QSystemTrayIcon::ActivationReason reason) {
if (trayIconMenu && cPlatform() == dbipMac) return;
if (cPlatform() == dbipMac && psIsActive()) return;
if (reason == QSystemTrayIcon::Context) {
updateTrayMenu(true);
QTimer::singleShot(1, this, SLOT(psShowTrayMenu()));