mirror of
https://github.com/xiaoyifang/goldendict-ng.git
synced 2024-11-23 20:14:05 +00:00
Merge pull request #1805 from xiaoyifang/staged
Some checks failed
Release AutoTag / Build (push) Has been cancelled
Release macOS / Build (macos-13, clang_64, 6.6.3) (push) Has been cancelled
Release macOS / Build (macos-13, clang_64, 6.7.3) (push) Has been cancelled
Release macOS / Build (macos-14, clang_64, 6.6.3) (push) Has been cancelled
Release macOS / Build (macos-14, clang_64, 6.7.3) (push) Has been cancelled
Release Windows CMake / Build (windows-2022, win64_msvc2019_64, 6.6.3) (push) Has been cancelled
Release Windows CMake / Build (windows-2022, win64_msvc2019_64, 6.7.3) (push) Has been cancelled
Some checks failed
Release AutoTag / Build (push) Has been cancelled
Release macOS / Build (macos-13, clang_64, 6.6.3) (push) Has been cancelled
Release macOS / Build (macos-13, clang_64, 6.7.3) (push) Has been cancelled
Release macOS / Build (macos-14, clang_64, 6.6.3) (push) Has been cancelled
Release macOS / Build (macos-14, clang_64, 6.7.3) (push) Has been cancelled
Release Windows CMake / Build (windows-2022, win64_msvc2019_64, 6.6.3) (push) Has been cancelled
Release Windows CMake / Build (windows-2022, win64_msvc2019_64, 6.7.3) (push) Has been cancelled
merge staged to dev
This commit is contained in:
commit
44992766c6
|
@ -22,14 +22,13 @@
|
|||
#endif
|
||||
#include "base_type.hh"
|
||||
|
||||
/// We use different window flags under Windows and X11 due to slight differences
|
||||
/// in their behavior on those platforms.
|
||||
|
||||
static const Qt::WindowFlags defaultUnpinnedWindowFlags =
|
||||
|
||||
#if defined( Q_OS_WIN )
|
||||
Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint
|
||||
#else
|
||||
Qt::Popup
|
||||
Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint
|
||||
#endif
|
||||
;
|
||||
|
||||
|
|
Loading…
Reference in a new issue