fix wayland resize issue and better wayland check method

Author: sulincix

src/main.cpp

@@ -12,6 +12,7 @@
 
 #include "tools.h"
 
+bool is_wayland;
 extern void mainWindowInit();
 int history;
 
@@ -29,6 +30,7 @@ int main(int argc, char *argv[]) {
     p2.execute("gsettings", args2);
 #endif
 
+    is_wayland = (getenv("WAYLAND_DISPLAY") != NULL);
     // gnome wayland fullscreen compositor is buggy.
     // Force prefer Xwayland for fix this issue.
     bool force_xwayland = false;
@@ -39,6 +41,7 @@ int main(int argc, char *argv[]) {
     // Force use X11 or Xwayland
     if(get_bool("xwayland") || force_xwayland){
         setenv("QT_QPA_PLATFORM", "xcb;wayland",1);
+        is_wayland = false;
     }
     //Force ignore system dpi
     setenv("QT_AUTO_SCREEN_SCALE_FACTOR", "0", 1);

src/tools.h

@@ -62,6 +62,7 @@ extern QWidget *bgMenu;
 
 extern float scale;
 extern int history;
+extern bool is_wayland;
 
 extern QSlider *scrollHSlider;
 extern QSlider *scrollVSlider;

src/tools/mainWindow.cpp

@@ -123,22 +123,22 @@ class MainWindow : public QMainWindow {
         floatingWidget->new_y = get_int("cur-y");
         // tool is not set under wayland
         if(floatingWidget != nullptr) {
-            if(tool != nullptr){
+            if(!is_wayland){
                 tool->resize(floatingWidget->geometry().width(), floatingWidget->geometry().height());
             }
-            if(tool2 != nullptr){
+            if(!is_wayland){
                 tool2->resize(floatingSettings->geometry().width(), floatingSettings->geometry().height());
             }
             drawing->update();
         }
+        floatingWidget->moveAction();
         // Call the base class implementation
         QWidget::resizeEvent(event);
-        floatingWidget->moveAction();
     }
     void changeEvent(QEvent *event) override {
         // Call the base class implementation
         QMainWindow::changeEvent(event);
-        if(tool != nullptr){
+        if(!is_wayland){
             if (event->type() == QEvent::WindowStateChange) {
                 tool2->hide();
                 if (isMinimized()) {
@@ -162,7 +162,7 @@ static bool hideState = true;
 void setupTools(){
 #ifndef ETAP19
     // detect x11
-    if(!getenv("WAYLAND_DISPLAY")){
+    if(!is_wayland){
         // main toolbar
         tool = new QMainWindow();
         tool->setWindowFlags(Qt::WindowStaysOnTopHint
@@ -247,7 +247,7 @@ void setupTools(){
     QScreen *screen = QGuiApplication::primaryScreen();
     toolButtons[FULLSCREEN] = create_button(FULLSCREEN_EXIT, [=](){
         mainWidget->move(0,0);
-        if ((tool != nullptr) && (tool2 != nullptr)){
+        if (!is_wayland){
             tool->hide();
             tool2->hide();
             tool->show();

src/widgets/FloatingWidget.cpp

@@ -80,13 +80,13 @@ void FloatingWidget::setVertical(bool state) {
         if(state) {
             layout->addWidget(widgets[i], row, column);
             setFixedSize(width, height);
-            if(tool != nullptr){
+            if(!is_wayland){
                 tool->setFixedSize(width, height);
             }
-            } else {
+        } else {
             layout->addWidget(widgets[i], column, row, Qt::AlignCenter);
             setFixedSize(height, width);
-            if(tool != nullptr){
+            if(!is_wayland){
                 tool->setFixedSize(height, width);
             }
         }
@@ -95,14 +95,15 @@ void FloatingWidget::setVertical(bool state) {
 
 
 void FloatingWidget::moveAction(){
+        debug("Move Action %d %d\n", new_x, new_y);
         if (new_x < 0) {
             new_x = 0;
         }if (new_y < 0) {
             new_y = 0;
         }
         int max_width = mainWindow->geometry().width();
         int max_height = mainWindow->geometry().height();
-        if(tool2 != nullptr){
+        if(!is_wayland){
             max_width = QGuiApplication::primaryScreen()->size().width();
             max_height = QGuiApplication::primaryScreen()->size().height();
         }
@@ -111,7 +112,7 @@ void FloatingWidget::moveAction(){
         }if (new_y > max_height - size().height()) {
             new_y = max_height - size().height();
         }
-        if(tool != nullptr){
+        if(!is_wayland){
             tool->move(new_x, new_y);
         } else {
             move(new_x, new_y);
@@ -125,7 +126,7 @@ void FloatingWidget::moveAction(){
             if (new_yy > max_height - floatingSettings->cur_height) {
                 new_yy = max_height - floatingSettings->cur_height;
             }
-             if(tool2 != nullptr){
+             if(!is_wayland){
                 tool2->move(new_xx, new_yy);
             } else {
                 floatingSettings->move(new_xx, new_yy);