From aeae6c931118c7b4e955ba25de51fe1f76573c69 Mon Sep 17 00:00:00 2001 From: Syping Date: Tue, 25 Dec 2018 21:05:09 +0100 Subject: [PATCH] fix DPI scaling in PictureDialog --- PictureDialog.cpp | 6 ++++++ res/5sync.ico | Bin 39414 -> 89817 bytes 2 files changed, 6 insertions(+) diff --git a/PictureDialog.cpp b/PictureDialog.cpp index d024c4c..9144380 100644 --- a/PictureDialog.cpp +++ b/PictureDialog.cpp @@ -188,6 +188,12 @@ void PictureDialog::setupPictureDialog() ui->labPicture->setFixedSize(960 * screenRatio, 536 * screenRatio); ui->labPicture->setFocusPolicy(Qt::StrongFocus); + // DPI calculation + ui->hlButtons->setSpacing(6 * screenRatio); + ui->vlButtons->setSpacing(6 * screenRatio); + ui->vlButtons->setContentsMargins(0, 0, 5 * screenRatio, 5 * screenRatio); + ui->jsonLayout->setContentsMargins(4 * screenRatio, 10 * screenRatio, 4 * screenRatio, 4 * screenRatio); + // Pre-adapt window for DPI setFixedWidth(960 * screenRatio); setFixedHeight(536 * screenRatio); diff --git a/res/5sync.ico b/res/5sync.ico index 105c5cc5ac81dd118c708ba004cc5e86ebd9a49c..af3d0fc961409b9eefe90ab36cac90a5ed1e76a3 100644 GIT binary patch delta 12372 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 LSs0cYU?TnlW^TuV