diff --git a/colorpicker/colorpickerscene.cpp b/colorpicker/colorpickerscene.cpp index 3cb868f..514c130 100644 --- a/colorpicker/colorpickerscene.cpp +++ b/colorpicker/colorpickerscene.cpp @@ -15,6 +15,9 @@ ColorPickerScene::ColorPickerScene(QPixmap pixmap, QWidget *parentWidget) setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform | QPainter::HighQualityAntialiasing); setCursor(QCursor(Qt::CrossCursor)); setMouseTracking(true); + setWindowTitle("KShare Color Picker"); + setGeometry(pixmap.rect()); + setAttribute(Qt::WA_DeleteOnClose); pItem = addPixmap(pixmap); pItem->setZValue(-2); @@ -29,6 +32,8 @@ ColorPickerScene::ColorPickerScene(QPixmap pixmap, QWidget *parentWidget) color = pItem->pixmap().toImage().pixelColor(QCursor::pos()); text->setPlainText(color.name()); ellipse->setBrush(color); + + show(); } void ColorPickerScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { diff --git a/colorpicker/colorpickerscene.hpp b/colorpicker/colorpickerscene.hpp index da4bfc4..eb2cf00 100644 --- a/colorpicker/colorpickerscene.hpp +++ b/colorpicker/colorpickerscene.hpp @@ -17,12 +17,7 @@ public: void keyPressEvent(QKeyEvent *event) override; void mouseReleaseEvent(QGraphicsSceneMouseEvent *) override; static void showPicker() { - ColorPickerScene *s = new ColorPickerScene(screenshotutil::fullscreen(), 0); - QTimer::singleShot(0, [s] { - s->showFullScreen(); - QScopedPointer(s); - // Before anyone asks I have 0 clue about how does this not segfault - }); + ColorPickerScene(screenshotutil::fullscreen(), 0); } private: diff --git a/uploaders/uploadersingleton.cpp b/uploaders/uploadersingleton.cpp index f57f44f..f40f0dc 100644 --- a/uploaders/uploadersingleton.cpp +++ b/uploaders/uploadersingleton.cpp @@ -26,6 +26,7 @@ UploaderSingleton::UploaderSingleton() : QObject() { qFatal("Cannot determine location of your home directory"); } saveDir = QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/Screenshots"; + break; default: qFatal("Invalid config [saveLocation not int or is not in range]"); break;