mapeditor#1173: Change from QWidget to QFrame and set border.

Alturos · Aug 7, 2016 · 4c5a5ec · 4c5a5ec
1 parent b2a8979
commit 4c5a5ec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/tiled/imagecolorpickerwidget.cpp b/src/tiled/imagecolorpickerwidget.cpp
@@ -29,10 +29,11 @@ using namespace Tiled;
 using namespace Tiled::Internal;
 
 ImageColorPickerWidget::ImageColorPickerWidget(QWidget *parent) :
-    QWidget(parent),
+    QFrame(parent),
     mUi(new Ui::imageColorPickerWidget)
 {
     setWindowFlags(Qt::Popup);
+    setFrameStyle(QFrame::Plain | QFrame::Panel);
     mUi->setupUi(this);
     connect(mUi->imageArea, SIGNAL(mouseMoved(QMouseEvent*)), SLOT(onMouseMove(QMouseEvent*)));
     connect(mUi->imageArea, SIGNAL(mousePressed(QMouseEvent*)), SLOT(onMousePress(QMouseEvent*)));

diff --git a/src/tiled/imagecolorpickerwidget.h b/src/tiled/imagecolorpickerwidget.h
@@ -25,6 +25,7 @@
 #include <QPixmap>
 #include <QMouseEvent>
 #include <QDialog>
+#include <QFrame>
 
 namespace Ui {
 class imageColorPickerWidget;
@@ -36,7 +37,7 @@ namespace Internal {
 /**
  * A popup widget for selecting a colour from an image.
  */
-class ImageColorPickerWidget : public QWidget
+class ImageColorPickerWidget : public QFrame
 {
     Q_OBJECT