diff --git a/uppsrc/CtrlLib/ChGtk.cpp b/uppsrc/CtrlLib/ChGtk.cpp index a55f2d337..ddd78cb55 100644 --- a/uppsrc/CtrlLib/ChGtk.cpp +++ b/uppsrc/CtrlLib/ChGtk.cpp @@ -268,7 +268,7 @@ void ChHostSkin() s.thumbwidth = GtkInt(vscrollbar, "slider-width"); s.thumbmin = GTK_RANGE(vscrollbar)->min_slider_size; - s.barsize = max(DPI(14), GtkInt("slider_width")); // 'max' - ugly fix for ThinIce theme + s.barsize = max(14, GtkInt("slider_width")); // 'max' - ugly fix for ThinIce theme s.arrowsize = max(s.barsize, GtkInt("stepper_size")); // 'max' - ugly fix for ThinIce theme /* The only theme with 3 buttons is Amaranth and it does not look good... diff --git a/uppsrc/CtrlLib/ChGtk.h b/uppsrc/CtrlLib/ChGtk.h index 77a96a24d..8255c2440 100644 --- a/uppsrc/CtrlLib/ChGtk.h +++ b/uppsrc/CtrlLib/ChGtk.h @@ -145,7 +145,7 @@ void GtkChImgWith(Value& look, int shadow, int state, const Image& img, Color c, void GtkChImgWith(Value *look, const Image& img, int kind, Point offset = Point(0, 0)); bool IsEmptyImage(const Image& m); -Image GtkThemeIcon(const char *name, bool large); +Image GtkThemeIcon(const char *name, int sz); int GtkStyleInt(const char *name); String GtkStyleString(const char *name); diff --git a/uppsrc/CtrlLib/ChGtk0.cpp b/uppsrc/CtrlLib/ChGtk0.cpp index 675428bea..c3db73f85 100644 --- a/uppsrc/CtrlLib/ChGtk0.cpp +++ b/uppsrc/CtrlLib/ChGtk0.cpp @@ -556,9 +556,8 @@ bool IsEmptyImage(const Image& m) return true; } -Image GtkThemeIcon(const char *name, bool large) +Image GtkThemeIcon(const char *name, int rsz) { - int rsz = large ? 48 : 16; Image m = GetGTK(gtk__parent(), rsz, 0, name, GTK_THEMEICON, 0, 0); Size sz = m.GetSize(); if(sz.cx > rsz || sz.cy > rsz) diff --git a/uppsrc/CtrlLib/FileSel.cpp b/uppsrc/CtrlLib/FileSel.cpp index 391e95915..b6de02b68 100644 --- a/uppsrc/CtrlLib/FileSel.cpp +++ b/uppsrc/CtrlLib/FileSel.cpp @@ -83,11 +83,11 @@ Image GetFileIcon(const char *path, bool dir, bool force, bool large, bool quick #if defined(PLATFORM_X11) && !defined(flagNOGTK) -Image GtkThemeIcon(const char *name, bool large); +Image GtkThemeIcon(const char *name, int sz); Image GnomeImage(const char *s, bool large = false) { - return GtkThemeIcon(String("gnome-") + s, large); + return GtkThemeIcon(String("gnome-") + s, DPI(large ? 48 : 16)); } Image SystemImage(const char *s, bool large = false)