From 13023a49853187aa1eaae17b98d5a7f7d5a081a2 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Mon, 27 Oct 2014 04:20:13 +0300 Subject: [PATCH] add workaround for #34 to AW --- sources/awesome-widget/awesome-widget.cpp | 2 ++ sources/awesome-widget/configuration.cpp | 2 +- sources/awesome-widget/customlabel.cpp | 2 +- sources/awesome-widget/reinit.cpp | 5 ++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sources/awesome-widget/awesome-widget.cpp b/sources/awesome-widget/awesome-widget.cpp index 2ee5271..2378a42 100644 --- a/sources/awesome-widget/awesome-widget.cpp +++ b/sources/awesome-widget/awesome-widget.cpp @@ -219,7 +219,9 @@ void AwesomeWidget::init() mainLayout->setContentsMargins(1, 1, 1, 1); setLayout(mainLayout); textLabel = new CustomLabel(this, debug); + textLabel->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); QGraphicsProxyWidget *pw = new QGraphicsProxyWidget(this); + pw->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); textLabel->setAttribute(Qt::WA_TranslucentBackground, true); pw->setWidget(textLabel); mainLayout->addItem(pw, 0, 0); diff --git a/sources/awesome-widget/configuration.cpp b/sources/awesome-widget/configuration.cpp index b5e7d76..4b4292f 100644 --- a/sources/awesome-widget/configuration.cpp +++ b/sources/awesome-widget/configuration.cpp @@ -662,7 +662,7 @@ void AwesomeWidget::configChanged() fontStyle = QString("italic"); else fontStyle = QString("normal"); - formatLine[0] = QString("\ + formatLine[0] = QString("\ ") .arg(font.family()) .arg(font.pointSize()) diff --git a/sources/awesome-widget/customlabel.cpp b/sources/awesome-widget/customlabel.cpp index 5209706..b50b88a 100644 --- a/sources/awesome-widget/customlabel.cpp +++ b/sources/awesome-widget/customlabel.cpp @@ -93,5 +93,5 @@ void CustomLabel::mousePressEvent(QMouseEvent *event) widget->sendNotification(QString("system"), text); } - emit(QLabel::mousePressEvent(event)); + emit(QWidget::mousePressEvent(event)); } diff --git a/sources/awesome-widget/reinit.cpp b/sources/awesome-widget/reinit.cpp index f700aa9..cb93527 100644 --- a/sources/awesome-widget/reinit.cpp +++ b/sources/awesome-widget/reinit.cpp @@ -38,8 +38,6 @@ void AwesomeWidget::reinit() else textLabel->setPopupEnabled(true); updateText(true); - textLabel->adjustSize(); - mainLayout->itemAt(0, 0)->setGeometry(textLabel->geometry()); keys = getKeys(); foundKeys = findKeys(); @@ -86,7 +84,8 @@ void AwesomeWidget::updateText(const bool clear) text.replace(QString("$\\$\\"), QString("$$")); } textLabel->setText(formatLine[0] + text + formatLine[1]); - update(); + mainLayout->itemAt(0, 0)->updateGeometry(); + updateGeometry(); }