From 06483c9479fb0fc80d02e0a8a14c508a20bd4f42 Mon Sep 17 00:00:00 2001 From: Mirek Fidler Date: Mon, 6 Apr 2026 11:49:07 +0200 Subject: [PATCH] Fixed gtk --- uppsrc/CtrlCore/GtkCustomBar.cpp | 4 ++-- uppsrc/ide/IconDes/Paint.cpp | 4 ---- uppsrc/ide/MainConfig.cpp | 1 - upptst/IMLScale/a.iml | 1 - 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/uppsrc/CtrlCore/GtkCustomBar.cpp b/uppsrc/CtrlCore/GtkCustomBar.cpp index 523c2a89b..8c454bceb 100644 --- a/uppsrc/CtrlCore/GtkCustomBar.cpp +++ b/uppsrc/CtrlCore/GtkCustomBar.cpp @@ -68,12 +68,12 @@ void TopWindow::Init() int Ctrl::GetGtkTitleBarHeight(const TopWindow *tw) { - return max(tw->custom_titlebar_cy, IsUHDMode() ? 60 : 31); + return max(tw->custom_titlebar_cy, DPI(31)); } int Ctrl::GetGtkTitleBarButtonWidth() { - return IsUHDMode() ? 94 : 47; + return DPI(47); } void TopWindow::SyncIcons() diff --git a/uppsrc/ide/IconDes/Paint.cpp b/uppsrc/ide/IconDes/Paint.cpp index 7ef2d1d1d..a55a42975 100644 --- a/uppsrc/ide/IconDes/Paint.cpp +++ b/uppsrc/ide/IconDes/Paint.cpp @@ -31,11 +31,7 @@ void IconShow::Paint(Draw& w) return DPISmartRescale(image, scale * image.GetSize() / image_scale); }; - Size sz100 = GetSize(DPI_100); - Size sz150 = GetSize(DPI_150); - Size sz200 = GetSize(DPI_200); Size sz300 = GetSize(DPI_300); - if(sz300.cx * sz300.cy > 20000) { w.DrawRect(sz, SColorPaper); w.DrawImage(DPI(5), DPI(5), image); diff --git a/uppsrc/ide/MainConfig.cpp b/uppsrc/ide/MainConfig.cpp index 3de281983..04550e85f 100644 --- a/uppsrc/ide/MainConfig.cpp +++ b/uppsrc/ide/MainConfig.cpp @@ -233,7 +233,6 @@ MainConfigDlg::MainConfigDlg(const Workspace& wspc_) : wspc(wspc_) { append.SetImage(IdeImg::add()) << [=] { FlagsDlg cfg; if(cfg.Run() == IDOK) { - int q = config.GetCount(); cfg.Set(config.Add()); LoadList(config.GetCount() - 1); } diff --git a/upptst/IMLScale/a.iml b/upptst/IMLScale/a.iml index 53545c392..10d55eb59 100644 --- a/upptst/IMLScale/a.iml +++ b/upptst/IMLScale/a.iml @@ -1,2 +1 @@ PREMULTIPLIED -VERSION(20260403)