Skip to content

Commit

Permalink
Merge pull request #1805 from xiaoyifang/staged
Browse files Browse the repository at this point in the history
merge staged to dev
  • Loading branch information
shenlebantongying authored Oct 7, 2024
2 parents 429fc5c + 7f497b0 commit 4499276
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/ui/scanpopup.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
;

Expand Down

0 comments on commit 4499276

Please sign in to comment.