mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
fix(platform): Added checkCapsLock OSX implementation
This commit is contained in:
parent
c7d485f515
commit
35a0e1fb6f
3
qtox.pro
3
qtox.pro
|
@ -96,7 +96,8 @@ contains(DEFINES, QTOX_PLATFORM_EXT) {
|
||||||
|
|
||||||
HEADERS += src/platform/capslock.h
|
HEADERS += src/platform/capslock.h
|
||||||
SOURCES += src/platform/capslock_win.cpp \
|
SOURCES += src/platform/capslock_win.cpp \
|
||||||
src/platform/capslock_x11.cpp
|
src/platform/capslock_x11.cpp \
|
||||||
|
src/platform/capslock_osx.cpp
|
||||||
}
|
}
|
||||||
|
|
||||||
# Rules for Windows, Mac OSX, and Linux
|
# Rules for Windows, Mac OSX, and Linux
|
||||||
|
|
30
src/platform/capslock_osx.cpp
Normal file
30
src/platform/capslock_osx.cpp
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
/*
|
||||||
|
Copyright © 2016 by The qTox Project
|
||||||
|
|
||||||
|
This file is part of qTox, a Qt-based graphical interface for Tox.
|
||||||
|
|
||||||
|
qTox is libre software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
qTox is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <QtCore/qsystemdetection.h>
|
||||||
|
#if defined(__APPLE__) && defined(__MACH__)
|
||||||
|
#include "src/platform/capslock.h"
|
||||||
|
|
||||||
|
bool Platform::capsLockEnabled()
|
||||||
|
{
|
||||||
|
// TODO: implement for osx
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // defined(__APPLE__) && defined(__MACH__)
|
|
@ -22,7 +22,7 @@
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include "src/platform/capslock.h"
|
#include "src/platform/capslock.h"
|
||||||
|
|
||||||
bool Platform::checkCapsLock()
|
bool Platform::capsLockEnabled()
|
||||||
{
|
{
|
||||||
return GetKeyState(VK_CAPITAL) == 1;
|
return GetKeyState(VK_CAPITAL) == 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,4 +40,4 @@ bool Platform::capsLockEnabled()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#endif // Q_WS_X11
|
#endif // defined(Q_OS_UNIX) && !defined(__APPLE__) && !defined(__MACH__)
|
||||||
|
|
|
@ -99,7 +99,8 @@ void LoginScreen::CapsLockIndicator::hide() {
|
||||||
|
|
||||||
void LoginScreen::CapsLockIndicator::updateIndicator() {
|
void LoginScreen::CapsLockIndicator::updateIndicator() {
|
||||||
bool caps = false;
|
bool caps = false;
|
||||||
#ifdef QTOX_PLATFORM_EXT
|
// It doesn't needed for OSX, because it shows indicator by default
|
||||||
|
#ifdef QTOX_PLATFORM_EXT && !defined(Q_OS_OSX)
|
||||||
caps = Platform::capsLockEnabled();
|
caps = Platform::capsLockEnabled();
|
||||||
#endif
|
#endif
|
||||||
if (caps)
|
if (caps)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user