diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index bf226aa..7723fe9 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -16,7 +16,7 @@ message (STATUS "Version: ${PROJECT_VERSION}") # flags if (CMAKE_COMPILER_IS_GNUCXX) - set (CMAKE_CXX_FLAGS "-Wall -std=c++11") + set (CMAKE_CXX_FLAGS "-Wall -Wno-cpp -std=c++11") set (CMAKE_CXX_FLAGS_DEBUG "-g -O0") set (CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") else () diff --git a/sources/awesome-widget/awesome-widget.cpp b/sources/awesome-widget/awesome-widget.cpp index a64f891..3a35530 100644 --- a/sources/awesome-widget/awesome-widget.cpp +++ b/sources/awesome-widget/awesome-widget.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -199,7 +200,13 @@ void AwesomeWidget::init() mainLayout->setContentsMargins(1, 1, 1, 1); setLayout(mainLayout); textLabel = new CustomLabel(this, debug); - mainLayout->addItem(textLabel, 0, 0); + QGraphicsProxyWidget *pw = new QGraphicsProxyWidget(this); + pw->setAttribute(Qt::WA_TranslucentBackground, true); + pw->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + textLabel->setAttribute(Qt::WA_TranslucentBackground, true); + textLabel->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + pw->setWidget(textLabel); + mainLayout->addItem(pw, 0, 0); // read variables configChanged(); diff --git a/sources/awesome-widget/customlabel.cpp b/sources/awesome-widget/customlabel.cpp index 47b9146..5209706 100644 --- a/sources/awesome-widget/customlabel.cpp +++ b/sources/awesome-widget/customlabel.cpp @@ -26,7 +26,7 @@ CustomLabel::CustomLabel(AwesomeWidget *wid, const bool debugCmd) - : Plasma::Label(wid), + : QLabel(0), widget(wid), debug(debugCmd) { @@ -49,7 +49,7 @@ void CustomLabel::setPopupEnabled(const bool state) } -void CustomLabel::mousePressEvent(QGraphicsSceneMouseEvent *event) +void CustomLabel::mousePressEvent(QMouseEvent *event) { if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG << ":" << "Get signal" << event->button(); @@ -93,5 +93,5 @@ void CustomLabel::mousePressEvent(QGraphicsSceneMouseEvent *event) widget->sendNotification(QString("system"), text); } - emit(Plasma::Label::mousePressEvent(event)); + emit(QLabel::mousePressEvent(event)); } diff --git a/sources/awesome-widget/customlabel.h b/sources/awesome-widget/customlabel.h index adf45f1..9c9f870 100644 --- a/sources/awesome-widget/customlabel.h +++ b/sources/awesome-widget/customlabel.h @@ -18,22 +18,22 @@ #ifndef CUSTOMLABEL_H #define CUSTOMLABEL_H -#include +#include class AwesomeWidget; -class CustomLabel : public Plasma::Label +class CustomLabel : public QLabel { Q_OBJECT public: - CustomLabel(AwesomeWidget *wid, const bool debugCmd); + CustomLabel(AwesomeWidget *wid, const bool debugCmd = false); ~CustomLabel(); void setPopupEnabled(const bool state); protected: - void mousePressEvent(QGraphicsSceneMouseEvent *event); + void mousePressEvent(QMouseEvent *event); private: AwesomeWidget *widget; diff --git a/sources/awesome-widget/reinit.cpp b/sources/awesome-widget/reinit.cpp index 14477f2..0a044a0 100644 --- a/sources/awesome-widget/reinit.cpp +++ b/sources/awesome-widget/reinit.cpp @@ -38,6 +38,8 @@ void AwesomeWidget::reinit() else textLabel->setPopupEnabled(true); updateText(true); + textLabel->adjustSize(); + mainLayout->itemAt(0, 0)->adjustSize(); keys = getKeys(); foundKeys = findKeys();