void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove std::optional indrection for nullable XCB types

Browse source
This commit is contained in:
Ilya Fedin 2024-06-15 22:40:04 +04:00 • committed by John Preston
parent 81d7fcba7e
commit 032fe3e0fc
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Telegram/SourceFiles/platform/linux/main_window_linux.cpp
View file

@ -57,7 +57,7 @@ void XCBSkipTaskbar(QWindow *window, bool skip) {
} }
const auto root = base::Platform::XCB::GetRootWindow(connection); const auto root = base::Platform::XCB::GetRootWindow(connection);
if (!root.has_value()) { if (!root) {
return; return;
} }
@ -65,7 +65,7 @@ void XCBSkipTaskbar(QWindow *window, bool skip) {
connection, connection,
"_NET_WM_STATE"); "_NET_WM_STATE");
if (!stateAtom.has_value()) { if (!stateAtom) {
return; return;
} }
@ -73,18 +73,18 @@ void XCBSkipTaskbar(QWindow *window, bool skip) {
connection, connection,
"_NET_WM_STATE_SKIP_TASKBAR"); "_NET_WM_STATE_SKIP_TASKBAR");
if (!skipTaskbarAtom.has_value()) { if (!skipTaskbarAtom) {
return; return;
} }
xcb_client_message_event_t xev; xcb_client_message_event_t xev;
xev.response_type = XCB_CLIENT_MESSAGE; xev.response_type = XCB_CLIENT_MESSAGE;
xev.type = *stateAtom; xev.type = stateAtom;
xev.sequence = 0; xev.sequence = 0;
xev.window = window->winId(); xev.window = window->winId();
xev.format = 32; xev.format = 32;
xev.data.data32[0] = skip ? 1 : 0; xev.data.data32[0] = skip ? 1 : 0;
xev.data.data32[1] = *skipTaskbarAtom; xev.data.data32[1] = skipTaskbarAtom;
xev.data.data32[2] = 0; xev.data.data32[2] = 0;
xev.data.data32[3] = 0; xev.data.data32[3] = 0;
xev.data.data32[4] = 0; xev.data.data32[4] = 0;
@ -92,7 +92,7 @@ void XCBSkipTaskbar(QWindow *window, bool skip) {
xcb_send_event( xcb_send_event(
connection, connection,
false, false,
*root, root,
XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT
| XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY, | XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY,
reinterpret_cast<const char*>(&xev)); reinterpret_cast<const char*>(&xev));

2
Telegram/lib_base

@ -1 +1 @@
Subproject commit 4d56f8b4bba52b46844f46fafa5f9b6b2704429e Subproject commit e14c5543f08221d261d8cd015219be5c1062e080

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit e54296fc1d8a8b1a3d92846ce7d02f3f90b0a32e Subproject commit 3ac659ec2634974308254fe7123e31c36ebf662b