Nemcio/SysTray-X
1
0
Fork 0
mirror of https://github.com/Ximi1970/systray-x.git synced 2026-05-06 18:17:17 +02:00
Code Issues Packages Projects Releases Activity

Update windows build

Browse Source
This commit is contained in:
Ximi1970
2024-04-01 23:09:21 +02:00
parent f23694958d
commit f37b011768
5 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/SysTray-X/SysTray-X-app/SysTray-X-app.pro
View File

@@ -181,7 +181,7 @@ unix: {
}
win32: {
SOURCES += \
nativeeventfilter-win.cpp
nativeeventfilter-win.cpp \
windowctrl-win.cpp
}

10
app/SysTray-X/SysTray-X-app/nativeeventfilter-win.cpp
View File

@@ -90,7 +90,11 @@ const QMap< Qt::Key, int > NativeEventFilterWin::m_virtual_key_map {
/*
* Catch the key press
*/
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
bool NativeEventFilterWin::nativeEventFilter( const QByteArray& eventType, void* message, long* result )
#else
bool NativeEventFilterWin::nativeEventFilter( const QByteArray& eventType, void* message, qintptr* result )
#endif
{
Q_UNUSED( eventType )
Q_UNUSED( result )
@@ -114,9 +118,13 @@ bool NativeEventFilterWin::nativeEventFilter( const QByteArray& eventType, void*
*/
bool NativeEventFilterWin::connectShortcut( QKeySequence key_seq )
{
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
Qt::Key key_code = Qt::Key( key_seq[ 0 ] & static_cast< int >( ~Qt::KeyboardModifierMask ) );
Qt::KeyboardModifiers key_modifiers = Qt::KeyboardModifiers( key_seq[ 0 ] & static_cast<int>( Qt::KeyboardModifierMask ) );
#else
Qt::Key key_code = Qt::Key( key_seq[ 0 ].toCombined() & static_cast< int >( ~Qt::KeyboardModifierMask ) );
Qt::KeyboardModifiers key_modifiers = Qt::KeyboardModifiers( key_seq[ 0 ].toCombined() & static_cast<int>( Qt::KeyboardModifierMask ) );
#endif
return connectShortcut( key_code, key_modifiers );
}

4
app/SysTray-X/SysTray-X-app/nativeeventfilter-win.h
View File

@@ -38,7 +38,11 @@ class NativeEventFilterWin : public NativeEventFilterBase
*
* @return Result
*/
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
bool nativeEventFilter( const QByteArray& eventType, void* message, long* result ) override;
#else
bool nativeEventFilter( const QByteArray& eventType, void* message, qintptr* result ) override;
#endif
protected:

1
app/SysTray-X/SysTray-X-app/nativeeventfilter-x11.cpp
View File

@@ -24,7 +24,6 @@ const int NativeEventFilterX11::m_valid_mods_mask = ShiftMask | ControlMask | Mo
/*
* Catch the key press
*/
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
bool NativeEventFilterX11::nativeEventFilter( const QByteArray& eventType, void* message, long* result )
#else

5
app/SysTray-X/SysTray-X-app/windowctrl.h
View File

@@ -5,7 +5,8 @@
* Qt includes
*/
#include <QtGlobal>
#include <QObject>
#include <QPoint>
/*
* Local includes
@@ -23,7 +24,7 @@
* Predefines
*/
class QWindow;
class Preferences;
//class Preferences;
/**
* @brief The WindowCtrl class.