kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Use new Qt 6 adapters

Browse source
This commit is contained in:
Ilya Fedin 2021-10-19 18:50:26 +04:00 • committed by John Preston
parent 534541367c
commit 64e40913df
8 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ui/platform/linux/ui_utility_linux.cpp
View file

@ -10,7 +10,6 @@
#include "base/debug_log.h" #include "base/debug_log.h"
#include "ui/platform/linux/ui_linux_wayland_integration.h" #include "ui/platform/linux/ui_linux_wayland_integration.h"
#include "base/const_string.h" #include "base/const_string.h"
#include "base/qt_adapters.h"
#include "base/flat_set.h" #include "base/flat_set.h"
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
@ -434,7 +433,7 @@ bool TranslucentWindowsSupported(QPoint globalPosition) {
if (::Platform::IsX11()) { if (::Platform::IsX11()) {
if (const auto native = QGuiApplication::platformNativeInterface()) { if (const auto native = QGuiApplication::platformNativeInterface()) {
if (const auto screen = base::QScreenNearestTo(globalPosition)) { if (const auto screen = QGuiApplication::screenAt(globalPosition)) {
if (native->nativeResourceForScreen(QByteArray("compositingEnabled"), screen)) { if (native->nativeResourceForScreen(QByteArray("compositingEnabled"), screen)) {
return true; return true;
} }

1
ui/platform/mac/ui_utility_mac.mm
View file

@ -7,7 +7,6 @@
#include "ui/platform/mac/ui_utility_mac.h" #include "ui/platform/mac/ui_utility_mac.h"
#include "ui/integration.h" #include "ui/integration.h"
#include "base/qt_adapters.h"
#include <QtGui/QPainter> #include <QtGui/QPainter>
#include <QtGui/QtEvents> #include <QtGui/QtEvents>

3
ui/text/text_entity.cpp
View file

@ -9,7 +9,6 @@
#include "base/qthelp_url.h" #include "base/qthelp_url.h"
#include "base/qthelp_regex.h" #include "base/qthelp_regex.h"
#include "base/crc32hash.h" #include "base/crc32hash.h"
#include "base/qt_adapters.h"
#include "ui/text/text.h" #include "ui/text/text.h"
#include "ui/widgets/input_fields.h" #include "ui/widgets/input_fields.h"
#include "ui/emoji_config.h" #include "ui/emoji_config.h"
@ -1402,7 +1401,7 @@ QStringList PrepareSearchWords(
auto list = clean.split(SplitterOverride auto list = clean.split(SplitterOverride
? *SplitterOverride ? *SplitterOverride
: RegExpWordSplit(), : RegExpWordSplit(),
base::QStringSkipEmptyParts); Qt::SkipEmptyParts);
result.reserve(list.size()); result.reserve(list.size());
for (const auto &word : std::as_const(list)) { for (const auto &word : std::as_const(list)) {
auto trimmed = word.trimmed(); auto trimmed = word.trimmed();

9
ui/widgets/input_fields.cpp
View file

@ -15,6 +15,7 @@
#include "base/platform/base_platform_info.h" #include "base/platform/base_platform_info.h"
#include "emoji_suggestions_helper.h" #include "emoji_suggestions_helper.h"
#include "styles/palette.h" #include "styles/palette.h"
#include "base/qt_adapters.h"
#include <QtWidgets/QCommonStyle> #include <QtWidgets/QCommonStyle>
#include <QtWidgets/QScrollBar> #include <QtWidgets/QScrollBar>
@ -1011,7 +1012,7 @@ bool FlatInput::eventHook(QEvent *e) {
|| e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchEnd
|| e->type() == QEvent::TouchCancel) { || e->type() == QEvent::TouchCancel) {
const auto ev = static_cast<QTouchEvent*>(e); const auto ev = static_cast<QTouchEvent*>(e);
if (ev->device()->type() == QTouchDevice::TouchScreen) { if (ev->device()->type() == base::TouchDevice::TouchScreen) {
touchEvent(ev); touchEvent(ev);
} }
} }
@ -1382,7 +1383,7 @@ bool InputField::viewportEventInner(QEvent *e) {
|| e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchEnd
|| e->type() == QEvent::TouchCancel) { || e->type() == QEvent::TouchCancel) {
const auto ev = static_cast<QTouchEvent*>(e); const auto ev = static_cast<QTouchEvent*>(e);
if (ev->device()->type() == QTouchDevice::TouchScreen) { if (ev->device()->type() == base::TouchDevice::TouchScreen) {
handleTouchEvent(ev); handleTouchEvent(ev);
} }
} }
@ -1590,7 +1591,7 @@ void InputField::insertTag(const QString &text, QString tagId) {
cursor.insertText(text + ' ', _defaultCharFormat); cursor.insertText(text + ' ', _defaultCharFormat);
} else { } else {
_insertedTags.clear(); _insertedTags.clear();
_insertedTags.push_back({ 0, text.size(), tagId }); _insertedTags.push_back({ 0, int(text.size()), tagId });
_insertedTagsAreFromMime = false; _insertedTagsAreFromMime = false;
cursor.insertText(text + ' '); cursor.insertText(text + ' ');
_insertedTags.clear(); _insertedTags.clear();
@ -3819,7 +3820,7 @@ bool MaskedInputField::eventHook(QEvent *e) {
|| type == QEvent::TouchEnd || type == QEvent::TouchEnd
|| type == QEvent::TouchCancel) { || type == QEvent::TouchCancel) {
auto event = static_cast<QTouchEvent*>(e); auto event = static_cast<QTouchEvent*>(e);
if (event->device()->type() == QTouchDevice::TouchScreen) { if (event->device()->type() == base::TouchDevice::TouchScreen) {
touchEvent(event); touchEvent(event);
} }
} }

3
ui/widgets/labels.cpp
View file

@ -13,6 +13,7 @@
#include "ui/widgets/box_content_divider.h" #include "ui/widgets/box_content_divider.h"
#include "ui/basic_click_handlers.h" // UrlClickHandler #include "ui/basic_click_handlers.h" // UrlClickHandler
#include "ui/inactive_press.h" #include "ui/inactive_press.h"
#include "base/qt_adapters.h"
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>
#include <QtGui/QClipboard> #include <QtGui/QClipboard>
@ -546,7 +547,7 @@ void FlatLabel::contextMenuEvent(QContextMenuEvent *e) {
bool FlatLabel::eventHook(QEvent *e) { bool FlatLabel::eventHook(QEvent *e) {
if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) { if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) {
QTouchEvent *ev = static_cast<QTouchEvent*>(e); QTouchEvent *ev = static_cast<QTouchEvent*>(e);
if (ev->device()->type() == QTouchDevice::TouchScreen) { if (ev->device()->type() == base::TouchDevice::TouchScreen) {
touchEvent(ev); touchEvent(ev);
return true; return true;
} }

3
ui/widgets/popup_menu.cpp
View file

@ -16,7 +16,6 @@
#include "ui/delayed_activation.h" #include "ui/delayed_activation.h"
#include "ui/painter.h" #include "ui/painter.h"
#include "base/platform/base_platform_info.h" #include "base/platform/base_platform_info.h"
#include "base/qt_adapters.h"
#include <QtGui/QtEvents> #include <QtGui/QtEvents>
#include <QtGui/QPainter> #include <QtGui/QPainter>
@ -731,7 +730,7 @@ void PopupMenu::popup(const QPoint &p) {
} }
void PopupMenu::showMenu(const QPoint &p, PopupMenu *parent, TriggeredSource source) { void PopupMenu::showMenu(const QPoint &p, PopupMenu *parent, TriggeredSource source) {
const auto screen = base::QScreenNearestTo(p); const auto screen = QGuiApplication::screenAt(p);
if (!screen if (!screen
|| (!parent && ::Platform::IsMac() && !Platform::IsApplicationActive())) { || (!parent && ::Platform::IsMac() && !Platform::IsApplicationActive())) {
_hiding = false; _hiding = false;

5
ui/widgets/scroll_area.cpp
View file

@ -8,6 +8,7 @@
#include "ui/painter.h" #include "ui/painter.h"
#include "ui/ui_utility.h" #include "ui/ui_utility.h"
#include "base/qt_adapters.h"
#include <QtWidgets/QScrollBar> #include <QtWidgets/QScrollBar>
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>
@ -472,7 +473,7 @@ bool ScrollArea::eventFilter(QObject *obj, QEvent *e) {
bool res = QScrollArea::eventFilter(obj, e); bool res = QScrollArea::eventFilter(obj, e);
if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) { if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) {
QTouchEvent *ev = static_cast<QTouchEvent*>(e); QTouchEvent *ev = static_cast<QTouchEvent*>(e);
if (_touchEnabled && ev->device()->type() == QTouchDevice::TouchScreen) { if (_touchEnabled && ev->device()->type() == base::TouchDevice::TouchScreen) {
if (obj == widget()) { if (obj == widget()) {
touchEvent(ev); touchEvent(ev);
return true; return true;
@ -485,7 +486,7 @@ bool ScrollArea::eventFilter(QObject *obj, QEvent *e) {
bool ScrollArea::viewportEvent(QEvent *e) { bool ScrollArea::viewportEvent(QEvent *e) {
if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) { if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) {
QTouchEvent *ev = static_cast<QTouchEvent*>(e); QTouchEvent *ev = static_cast<QTouchEvent*>(e);
if (_touchEnabled && ev->device()->type() == QTouchDevice::TouchScreen) { if (_touchEnabled && ev->device()->type() == base::TouchDevice::TouchScreen) {
touchEvent(ev); touchEvent(ev);
return true; return true;
} }

3
ui/widgets/tooltip.cpp
View file

@ -9,7 +9,6 @@
#include "ui/ui_utility.h" #include "ui/ui_utility.h"
#include "ui/platform/ui_platform_utility.h" #include "ui/platform/ui_platform_utility.h"
#include "base/invoke_queued.h" #include "base/invoke_queued.h"
#include "base/qt_adapters.h"
#include "styles/style_widgets.h" #include "styles/style_widgets.h"
#include <QtGui/QScreen> #include <QtGui/QScreen>
@ -73,7 +72,7 @@ Tooltip::~Tooltip() {
} }
void Tooltip::popup(const QPoint &m, const QString &text, const style::Tooltip *st) { void Tooltip::popup(const QPoint &m, const QString &text, const style::Tooltip *st) {
const auto screen = base::QScreenNearestTo(m); const auto screen = QGuiApplication::screenAt(m);
if (!screen) { if (!screen) {
Hide(); Hide();
return; return;