Skip to content

Commit 7680190

Browse files
committed
Revert "Fix the sliding window problem in linux occur due to reparenting of the window during the decoration via tracking the parent of the window"
This reverts commit 932afc3.
1 parent 4219ce9 commit 7680190

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

platform/linuxbsd/x11/display_server_x11.cpp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4452,17 +4452,6 @@ void DisplayServerX11::_window_changed(XEvent *event) {
44524452
return;
44534453
}
44544454

4455-
// Readjusting the window position if the window is being reparented by the window manager for decoration
4456-
Window root, parent, *children;
4457-
unsigned int nchildren;
4458-
if (XQueryTree(x11_display, wd.x11_window, &root, &parent, &children, &nchildren) && wd.parent != parent) {
4459-
wd.parent = parent;
4460-
if (!wd.embed_parent) {
4461-
window_set_position(wd.position, window_id);
4462-
}
4463-
}
4464-
XFree(children);
4465-
44664455
{
44674456
//the position in xconfigure is not useful here, obtain it manually
44684457
int x = 0, y = 0;
@@ -6447,8 +6436,6 @@ DisplayServerX11::WindowID DisplayServerX11::_create_window(WindowMode p_mode, V
64476436
{
64486437
wd.x11_window = XCreateWindow(x11_display, RootWindow(x11_display, visualInfo.screen), win_rect.position.x, win_rect.position.y, win_rect.size.width > 0 ? win_rect.size.width : 1, win_rect.size.height > 0 ? win_rect.size.height : 1, 0, visualInfo.depth, InputOutput, visualInfo.visual, valuemask, &windowAttributes);
64496438

6450-
wd.parent = RootWindow(x11_display, visualInfo.screen);
6451-
64526439
DEBUG_LOG_X11("CreateWindow window=%lu, parent: %lu \n", wd.x11_window, wd.parent);
64536440

64546441
if (p_parent_window) {

platform/linuxbsd/x11/display_server_x11.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ class DisplayServerX11 : public DisplayServer {
164164
struct WindowData {
165165
Window x11_window;
166166
Window x11_xim_window;
167-
Window parent;
168167
::XIC xic;
169168
bool ime_active = false;
170169
bool ime_in_progress = false;

0 commit comments

Comments
 (0)