Skip to content
This repository has been archived by the owner on Feb 12, 2023. It is now read-only.

Commit

Permalink
fix(platform): Added checkCapsLock OSX implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
Diadlo committed Jun 7, 2016
1 parent c7d485f commit 35a0e1f
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 4 deletions.
3 changes: 2 additions & 1 deletion qtox.pro
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ contains(DEFINES, QTOX_PLATFORM_EXT) {

HEADERS += src/platform/capslock.h
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
Expand Down
30 changes: 30 additions & 0 deletions src/platform/capslock_osx.cpp
Original file line number Diff line number Diff line change
@@ -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__)
2 changes: 1 addition & 1 deletion src/platform/capslock_win.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <windows.h>
#include "src/platform/capslock.h"

bool Platform::checkCapsLock()
bool Platform::capsLockEnabled()
{
return GetKeyState(VK_CAPITAL) == 1;
}
Expand Down
2 changes: 1 addition & 1 deletion src/platform/capslock_x11.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ bool Platform::capsLockEnabled()
}


#endif // Q_WS_X11
#endif // defined(Q_OS_UNIX) && !defined(__APPLE__) && !defined(__MACH__)
3 changes: 2 additions & 1 deletion src/widget/loginscreen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ void LoginScreen::CapsLockIndicator::hide() {

void LoginScreen::CapsLockIndicator::updateIndicator() {
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();
#endif
if (caps)
Expand Down

0 comments on commit 35a0e1f

Please sign in to comment.