Workaround for emoji selector in popup menu on Windows.

This commit is contained in:
John Preston 2023-03-17 14:21:42 +04:00
parent bcb56492c4
commit 5173dfa1ca
4 changed files with 72 additions and 7 deletions

View file

@ -36,5 +36,8 @@ inline constexpr bool UseMainQueueGeneric() {
return true;
}
inline void FixPopupMenuNativeEmojiPopup(not_null<PopupMenu*> menu) {
}
} // namespace Platform
} // namespace Ui

View file

@ -40,5 +40,8 @@ inline void UnsetWindowExtents(not_null<QWidget*> widget) {
inline void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
}
inline void FixPopupMenuNativeEmojiPopup(not_null<PopupMenu*> menu) {
}
} // namespace Platform
} // namespace Ui

View file

@ -13,7 +13,10 @@ class QPainter;
class QPaintEvent;
namespace Ui {
namespace Platform {
class PopupMenu;
} // namespace Ui
namespace Ui::Platform {
[[nodiscard]] bool IsApplicationActive();
@ -47,8 +50,9 @@ void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point);
[[nodiscard]] rpl::producer<TitleControls::Layout> TitleControlsLayoutChanged();
void NotifyTitleControlsLayoutChanged();
} // namespace Platform
} // namespace Ui
void FixPopupMenuNativeEmojiPopup(not_null<PopupMenu*> menu);
} // namespace Ui::Platform
// Platform dependent implementations.

View file

@ -7,17 +7,18 @@
#include "ui/platform/win/ui_utility_win.h"
#include "base/platform/win/base_windows_h.h"
#include "ui/widgets/popup_menu.h"
#include <QtWidgets/QApplication>
#include <QtGui/QWindow>
#include <QtCore/QAbstractNativeEventFilter>
#include <wrl/client.h>
#include <Shobjidl.h>
using namespace Microsoft::WRL;
namespace Ui {
namespace Platform {
namespace Ui::Platform {
bool IsApplicationActive() {
return QApplication::activeWindow() != nullptr;
@ -143,5 +144,59 @@ TitleControls::Layout TitleControlsLayout() {
};
}
} // namespace Platform
} // namespace Ui
void FixPopupMenuNativeEmojiPopup(not_null<PopupMenu*> menu) {
// Windows native emoji selector, that can be called by Win+. shortcut,
// is behaving strangely within an input field in a popup menu.
//
// When the selector is shown and a mouse button is pressed the system
// sends two events "MousePress + MouseRelease" to the popup menu, even
// before the button is physically released. That way we hide the menu
// on this MousePress, that we shouldn't have received (in case of
// input field in the main window no such events are sent at all).
//
// To workaround this we detect a WM_MOUSELEAVE event that is sent to
// the popup menu when the selector is shown and skip all mouse press
// events while we don't receive mouse move events. If we receive mouse
// move events that means the selector was hidden and the mouse is
// captured by the popup menu again.
class Filter final : public QAbstractNativeEventFilter {
public:
explicit Filter(not_null<PopupMenu*> menu) : _menu(menu) {
}
bool nativeEventFilter(
const QByteArray &eventType,
void *message,
long *result) override {
const auto msg = static_cast<MSG*>(message);
switch (msg->message) {
case WM_MOUSELEAVE: if (msg->hwnd == hwnd()) {
_skipMouseDown = true;
} break;
case WM_MOUSEMOVE: if (msg->hwnd == hwnd()) {
_skipMouseDown = false;
} break;
case WM_LBUTTONDOWN:
case WM_LBUTTONDBLCLK: if (msg->hwnd == hwnd()) {
return _skipMouseDown;
}
}
return false;
}
private:
[[nodiscard]] HWND hwnd() const {
const auto top = _menu->window()->windowHandle();
return top ? reinterpret_cast<HWND>(top->winId()) : nullptr;
}
not_null<PopupMenu*> _menu;
bool _skipMouseDown = false;
};
QGuiApplication::instance()->installNativeEventFilter(
menu->lifetime().make_state<Filter>(menu));
}
} // namespace Ui::Platform