[X2Go-Commits] [x2gokdriveclient] 02/02: remove resizeWinFromServer code

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdriveclient.

commit 79b3b22188366bea9dd1b306c14565f5ea99f732
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Wed Apr 6 12:22:09 2022 +0200

    remove resizeWinFromServer code
---
 client.cpp       | 4 ++--
 debian/changelog | 1 +
 extwin.cpp       | 6 ------
 extwin.h         | 1 -
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/client.cpp b/client.cpp
index 0ed41da..554075a 100644
--- a/client.cpp
+++ b/client.cpp
@@ -1299,7 +1299,7 @@ void Client::getWinUpdateBuffer()
                     win->setMinimumWidth(minw);
                     win->setMinimumHeight(minh);
                 }
-                win->resizeWinFromServer(w,h);
+                win->resize(w,h);
                 win->moveWinFromServer(win->kdriveToVirtualPosition(QPoint(x,y)));
 //                 Client::KDRStdErr()<<"new win pos: "<<x<<":"<<y<<" translated to "<< win->kdriveToVirtualPosition(QPoint(x,y)).x()<<":"<<win->kdriveToVirtualPosition(QPoint(x,y)).y()<<KDR_ENDL;
                 win->showNormal();
@@ -1315,7 +1315,7 @@ void Client::getWinUpdateBuffer()
             QPoint adjustedWinPos=win->kdriveToVirtualPosition(QPoint(x,y));
 //             KDRStdErr()<<KDR_DEC<<name<<" "<<x<<":"<<y<<" "<<w<<"x"<<h<<" min size: "<<minw<<"x"<<minh<<" bw - "<<bw<<" "<<visibility<<KDR_ENDL;
             if(win->geometry().width() != w || win->geometry().height() != h)
-                win->resizeWinFromServer(w,h);
+                win->resize(w,h);
             if(win->geometry().x()!=adjustedWinPos.x() || win->geometry().y()!=adjustedWinPos.y())
                 win->moveWinFromServer(adjustedWinPos);
             if(win->windowTitle()!=name)
diff --git a/debian/changelog b/debian/changelog
index bb3faad..798137b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,5 +47,6 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
     - include <xcb/xproto.h> in extwin.h to fix build on leap423 and co
     - fix server version checking
     - reduce window updates when moving windows in rootless mode
+    - remove resizeWinFromServer code
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 04 Jun 2019 11:10:43 +0200
diff --git a/extwin.cpp b/extwin.cpp
index 8aed559..1aadaa4 100644
--- a/extwin.cpp
+++ b/extwin.cpp
@@ -98,12 +98,6 @@ void ExtWin::slotChangeWin()
     client->changeWindow(this);
 }
 
-void ExtWin::resizeWinFromServer(int w, int h)
-{
-    ignoreGeometryChangeEvent=true;
-    resize(w,h);
-    ignoreGeometryChangeEvent=false;
-}
 
 void ExtWin::moveEvent(QMoveEvent* ev)
 {
diff --git a/extwin.h b/extwin.h
index 4d22f23..a0f6bdd 100644
--- a/extwin.h
+++ b/extwin.h
@@ -54,7 +54,6 @@ public:
     void setHasFocus( bool f){focus=f;}
     uint8_t getHasFocus(){return focus;}
     void moveWinFromServer(QPoint pos);
-    void resizeWinFromServer(int w, int h);
 
 private:
 #ifdef Q_OS_LINUX

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git