Skip to content

ui/clickandgowidget: fix scaling issues on high-DPI screens #1947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jpue wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ui/clickandgowidget: fix scaling issues on high-DPI screens #1947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 64 additions & 44 deletions ui/src/clickandgowidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,29 +34,28 @@
#define CELL_H 45
#define TITLE_H 18

ClickAndGoWidget::ClickAndGoWidget(QWidget *parent) :
QWidget(parent)
ClickAndGoWidget::ClickAndGoWidget(QWidget *parent)
: QWidget(parent)
, m_type(ClickAndGo::None)
, m_width(10)
, m_height(10)
, m_cols(0)
, m_rows(0)
, m_cellWidth(CELL_W)
, m_hoverCellIdx(-1)
, m_cellBarXpos(1)
, m_cellBarYpos(1)
, m_cellBarWidth(0)
, m_levelLowLimit(0)
, m_levelHighLimit(255)
, m_linearColor(false)
{
// This makes the application crash when a clickAndGoWidget
// is created in a QDialog.
// setAttribute(Qt::WA_StaticContents);

setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
setMouseTracking(true);

m_type = None;
m_linearColor = false;
m_width = 10;
m_height = 10;
m_cols = 0;
m_rows = 0;
m_cellWidth = CELL_W;
m_hoverCellIdx = -1;
m_cellBarXpos = 1;
m_cellBarYpos = 1;
m_cellBarWidth = 0;
m_levelLowLimit = 0;
m_levelHighLimit = 255;
}

void ClickAndGoWidget::setupGradient(QColor begin, QColor end)
Expand All @@ -68,7 +67,7 @@ void ClickAndGoWidget::setupGradient(QColor begin, QColor end)
// create image and fill it with gradient
m_width = 276;
m_height = 40;
m_image = QImage(m_width, m_height, QImage::Format_RGB32);
m_image = getDPIAwareImage(m_width, m_height);
QPainter painter(&m_image);
painter.fillRect(m_image.rect(), linearGrad);

Expand All @@ -81,7 +80,7 @@ void ClickAndGoWidget::setupColorPicker()

m_width = 256 + 30;
m_height = 256;
m_image = QImage(m_width, m_height, QImage::Format_RGB32);
m_image = getDPIAwareImage(m_width, m_height);
QPainter painter(&m_image);

// Draw 16 default color squares
Expand Down Expand Up @@ -111,7 +110,7 @@ void ClickAndGoWidget::setType(int type, const QLCChannel *chan)
//qDebug() << Q_FUNC_INFO << "Type: " << type;
if (type == None)
{
m_image = QImage();
m_image = getDPIAwareImage(0, 0);
}
else if (type == Red)
setupGradient(Qt::black, Qt::red);
Expand Down Expand Up @@ -158,7 +157,7 @@ void ClickAndGoWidget::setLevelHighLimit(int max)
this->m_levelHighLimit = max;
}

int ClickAndGoWidget::getType()
int ClickAndGoWidget::getType() const
{
return m_type;
}
Expand Down Expand Up @@ -206,7 +205,7 @@ ClickAndGoWidget::ClickAndGo ClickAndGoWidget::stringToClickAndGoType(QString st
return None;
}

QColor ClickAndGoWidget::getColorAt(uchar pos)
QColor ClickAndGoWidget::getColorAt(uchar pos) const
{
if (m_linearColor == true)
{
Expand All @@ -216,7 +215,7 @@ QColor ClickAndGoWidget::getColorAt(uchar pos)
return QColor(0,0,0);
}

QImage ClickAndGoWidget::getImageFromValue(uchar value)
QImage ClickAndGoWidget::getImageFromValue(uchar value) const
{
/** If the widget type is a Preset, return directly
* the pre-loaded resource */
Expand Down Expand Up @@ -258,23 +257,23 @@ void ClickAndGoWidget::createPresetList(const QLCChannel *chan)
{
if (cap->presetType() == QLCCapability::Picture)
{
m_resources.append(PresetResource(cap->resource(0).toString(), cap->name(),
m_resources.append(PresetResource(this, cap->resource(0).toString(), cap->name(),
cap->min(), cap->max()));
}
else if (cap->presetType() == QLCCapability::SingleColor)
{
QColor col1 = cap->resource(0).value<QColor>();
m_resources.append(PresetResource(col1, QColor(), cap->name(), cap->min(), cap->max()));
m_resources.append(PresetResource(this, col1, QColor(), cap->name(), cap->min(), cap->max()));
}
else if (cap->presetType() == QLCCapability::DoubleColor)
{
QColor col1 = cap->resource(0).value<QColor>();
QColor col2 = cap->resource(1).value<QColor>();
m_resources.append(PresetResource(col1, col2, cap->name(), cap->min(), cap->max()));
m_resources.append(PresetResource(this, col1, col2, cap->name(), cap->min(), cap->max()));
}
else
{
m_resources.append(PresetResource(i, cap->name(), cap->min(), cap->max()));
m_resources.append(PresetResource(this, i, cap->name(), cap->min(), cap->max()));
}
i++;
}
Expand Down Expand Up @@ -311,7 +310,7 @@ void ClickAndGoWidget::setupPresetPicker()

int x = 0;
int y = 0;
m_image = QImage(m_width, m_height, QImage::Format_RGB32);
m_image = getDPIAwareImage(m_width, m_height);
QPainter painter(&m_image);
QPalette p = palette();
painter.setRenderHint(QPainter::Antialiasing);
Expand Down Expand Up @@ -429,28 +428,51 @@ void ClickAndGoWidget::paintEvent(QPaintEvent *event)
}
}

QImage ClickAndGoWidget::getDPIAwareImage(int width, int height) const
{
qreal devicePixelRatio = 1;
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
devicePixelRatio = devicePixelRatioF();
#else
const QScreen* currentScreen = QGuiApplication::screens().first();
if (currentScreen != NULL)
{
devicePixelRatio = currentScreen->devicePixelRatio();
}
#endif

QImage image(width*devicePixelRatio, height*devicePixelRatio, QImage::Format_RGB32);
image.setDevicePixelRatio(devicePixelRatio);

ClickAndGoWidget::PresetResource::PresetResource(QString path, QString text, uchar min, uchar max)
return image;
}

QImage ClickAndGoWidget::getDPIAwareImageStatic(const ClickAndGoWidget* parent, int width, int height)
{
return (parent != NULL) ? parent->getDPIAwareImage(width, height) : QImage(width, height, QImage::Format_RGB32);
}

ClickAndGoWidget::PresetResource::PresetResource(const ClickAndGoWidget* parent, QString path, QString text, uchar min, uchar max)
: m_descr(text)
, m_resLowLimit(min)
, m_resHighLimit(max)
{
m_descr = text;
m_resLowLimit = min;
m_resHighLimit = max;
QImage px(path);
m_thumbnail = QImage(40, 40, QImage::Format_RGB32);
m_thumbnail = getDPIAwareImageStatic(parent, 40, 40);
m_thumbnail.fill(Qt::white);
QPainter painter(&m_thumbnail);
painter.setRenderHint(QPainter::SmoothPixmapTransform);
painter.drawImage(QRect(0,0,40,40), px);
//qDebug() << "PATH: adding " << path << ", descr: " << text;
}

ClickAndGoWidget::PresetResource::PresetResource(QColor color1, QColor color2,
ClickAndGoWidget::PresetResource::PresetResource(const ClickAndGoWidget* parent, QColor color1, QColor color2,
QString text, uchar min, uchar max)
: m_descr(text)
, m_resLowLimit(min)
, m_resHighLimit(max)
{
m_descr = text;
m_resLowLimit = min;
m_resHighLimit = max;
m_thumbnail = QImage(40, 40, QImage::Format_RGB32);
m_thumbnail = getDPIAwareImageStatic(parent, 40, 40);
if (color2.isValid() == false)
m_thumbnail.fill(color1.rgb());
else
Expand All @@ -462,12 +484,12 @@ ClickAndGoWidget::PresetResource::PresetResource(QColor color1, QColor color2,
//qDebug() << "COLOR: adding " << color1.name() << ", descr: " << text;
}

ClickAndGoWidget::PresetResource::PresetResource(int index, QString text, uchar min, uchar max)
ClickAndGoWidget::PresetResource::PresetResource(const ClickAndGoWidget* parent, int index, QString text, uchar min, uchar max)
: m_descr(text)
, m_resLowLimit(min)
, m_resHighLimit(max)
{
m_descr = text;
m_resLowLimit = min;
m_resHighLimit = max;
m_thumbnail = QImage(40, 40, QImage::Format_RGB32);
m_thumbnail = getDPIAwareImageStatic(parent, 40, 40);
m_thumbnail.fill(Qt::white);
QFont tfont = QApplication::font();
tfont.setBold(true);
Expand All @@ -477,5 +499,3 @@ ClickAndGoWidget::PresetResource::PresetResource(int index, QString text, uchar
painter.drawText(0, 0, 40, 40, Qt::AlignHCenter|Qt::AlignVCenter, QString("%1").arg(index));
//qDebug() << "GENERIC: adding " << index << ", descr: " << text;
}


19 changes: 12 additions & 7 deletions ui/src/clickandgowidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class ClickAndGoWidget final : public QWidget
/**
* Returns the widget type
*/
int getType();
int getType() const;

/** Set the low limits from the fader as a preset filter */
void setLevelLowLimit(int min);
Expand All @@ -74,21 +74,26 @@ class ClickAndGoWidget final : public QWidget
* Returns the color at pos position.
* Used with primary colors linear gradient
*/
QColor getColorAt(uchar pos);
QColor getColorAt(uchar pos) const;

/**
* Return a QImage to be displayed on a Click & Go button
*
* @param value the slider position value
*/
QImage getImageFromValue(uchar value);
QImage getImageFromValue(uchar value) const;

/** Returns a human readable string of a Click And Go type */
static QString clickAndGoTypeToString(ClickAndGoWidget::ClickAndGo type);

/** Returns a Click And Go type from the given string */
static ClickAndGoWidget::ClickAndGo stringToClickAndGoType(QString str);

private:
QImage getDPIAwareImage(int width, int height) const;

static QImage getDPIAwareImageStatic(const ClickAndGoWidget* parent, int width, int height);

protected:
/**
* Prepare the widget to display a linear gradient
Expand Down Expand Up @@ -119,12 +124,12 @@ class ClickAndGoWidget final : public QWidget
* PresetResource Class
*************************************************************************/
private:
class PresetResource
class PresetResource final
{
public:
PresetResource(QString path, QString text, uchar min, uchar max);
PresetResource(QColor color1, QColor color2, QString text, uchar min, uchar max);
PresetResource(int index, QString text, uchar min, uchar max);
PresetResource(const ClickAndGoWidget* parent, QString path, QString text, uchar min, uchar max);
PresetResource(const ClickAndGoWidget* parent, QColor color1, QColor color2, QString text, uchar min, uchar max);
PresetResource(const ClickAndGoWidget* parent, int index, QString text, uchar min, uchar max);

public:
QImage m_thumbnail;
Expand Down
Loading