fixes

Author: sulincix

src/main.cpp

@@ -54,8 +54,8 @@ int main(int argc, char *argv[]) {
     // gnome wayland fullscreen compositor is buggy.
     // Force prefer Xwayland for fix this issue.
     if(getenv("XDG_CURRENT_DESKTOP")){
-        force_xwayland = strncmp(getenv("XDG_CURRENT_DESKTOP"), "gnome", 5) || \
-            strncmp(getenv("XDG_CURRENT_DESKTOP"), "GNOME", 5);
+        force_xwayland = strncmp(getenv("XDG_CURRENT_DESKTOP"), "gnome", 5) == 0 || \
+            strncmp(getenv("XDG_CURRENT_DESKTOP"), "GNOME", 5) == 0;
     }
     // Force use X11 or Xwayland
     if(get_bool("xwayland") || force_xwayland){

src/tools/screenshot.cpp

@@ -9,11 +9,11 @@ static void setCropScreenShot(QPixmap pix){
     board->setType(WHITE);
     board->setOverlayType(CUSTOM);
     board->rotates[drawing->getPageNum()] = 0;
-    board->ratios[drawing->getPageNum()] = pix.width() * 100 / board->geometry().width();
+    board->ratios[drawing->getPageNum()] = 100;
     board->updateTransform();
     setHideMainWindow(false);
+    floatingWidget->show();
 
-    printf("%s\n", "crop done");
 }
 #endif
 
@@ -36,17 +36,11 @@ void setupScreenShot(){
 
     ScreenshotWidget* widget = new ScreenshotWidget();
     widget->crop_signal = setCropScreenShot;
-    QTimer *sscTimer = new QTimer();
-    QObject::connect(sscTimer, &QTimer::timeout, [=](){
-        sscTimer->stop();
-        widget->showFullScreen();
-        floatingWidget->show();
 
-    });
     toolButtons[SCREENSHOT_CROP] = create_button(SCREENSHOT_CROP, [=](){
         floatingWidget->hide();
         floatingSettings->setHide();
-        sscTimer->start(500);
+        widget->showFullScreen();
     });
     set_shortcut(toolButtons[SCREENSHOT_CROP], Qt::Key_F2, Qt::ControlModifier);
     #endif

src/widgets/ScreenshotWidget.cpp

@@ -8,6 +8,7 @@
 #include "../tools.h"
 
 
+
 ScreenshotWidget::ScreenshotWidget(QWidget *parent)
     : QWidget(parent), selecting(false) {
     setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
@@ -18,6 +19,8 @@ ScreenshotWidget::ScreenshotWidget(QWidget *parent)
 
 void ScreenshotWidget::mousePressEvent(QMouseEvent *event) {
     startPos = event->pos();
+    endPos = event->pos();
+    update();
 }
 
 void ScreenshotWidget::mouseMoveEvent(QMouseEvent *event) {
@@ -26,8 +29,15 @@ void ScreenshotWidget::mouseMoveEvent(QMouseEvent *event) {
 }
 
 void ScreenshotWidget::mouseReleaseEvent(QMouseEvent *event) {
+
     endPos = event->pos();
-    cropScreenshot();
+    QPoint pos1 = startPos;
+    QPoint pos2 = endPos;
+    hide();
+    QTimer::singleShot(50, this, [=]() { 
+        this->cropScreenshot(pos1, pos2); 
+    });
+    // reset surface
     startPos = QPoint(-1, -1);
     endPos = QPoint(-1, -1);
     update();
@@ -36,24 +46,26 @@ void ScreenshotWidget::mouseReleaseEvent(QMouseEvent *event) {
 void ScreenshotWidget::paintEvent(QPaintEvent *) {
     QPainter painter(this);
     painter.setPen(Qt::NoPen);
+
     // background
-    painter.setBrush(QBrush(QColor(255, 255, 255, 13)));
-    painter.drawRect(QRect(0,0,geometry().width(), geometry().height()));
-    // selection
     QColor color = drawing->penColor;
-    color.setAlpha(127);
+    color.setAlpha(69);
     painter.setBrush(QBrush(color));
+    painter.setCompositionMode(QPainter::CompositionMode_Source);
+
+
+    painter.drawRect(QRect(0,0,geometry().width(), geometry().height()));
+    // selection
     QRect rect(startPos, endPos);
+    painter.setBrush(QBrush(QColor(0,0,0,0)));
     painter.drawRect(rect.normalized());
 }
 
-void ScreenshotWidget::cropScreenshot() {
+void ScreenshotWidget::cropScreenshot(QPoint startPos, QPoint endPos) {
     QScreen *screen = QGuiApplication::primaryScreen();
     QPixmap originalPixmap = screen->grabWindow(0);
-
     QRect cropRect(startPos, endPos);
     QPixmap croppedPixmap = originalPixmap.copy(cropRect.normalized());
     crop_signal(croppedPixmap);
-    hide();
 }
 

src/widgets/ScreenshotWidget.h

@@ -18,7 +18,7 @@ class ScreenshotWidget : public QWidget {
     void paintEvent(QPaintEvent *event) override;
 
 private:
-    void cropScreenshot();
+    void cropScreenshot(QPoint startPos, QPoint endPos);
 
     QPoint startPos;
     QPoint endPos;