From b295a996f958c20c9ef15dcb3465759f8a92b3dd Mon Sep 17 00:00:00 2001 From: cxl Date: Sun, 5 Dec 2010 14:01:26 +0000 Subject: [PATCH] CtrlLib:FileSel: X11 icons git-svn-id: svn://ultimatepp.org/upp/trunk@2891 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlLib/ChGtk.cpp | 6 +++--- uppsrc/CtrlLib/FileSel.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/uppsrc/CtrlLib/ChGtk.cpp b/uppsrc/CtrlLib/ChGtk.cpp index d145a8230..f0141c456 100644 --- a/uppsrc/CtrlLib/ChGtk.cpp +++ b/uppsrc/CtrlLib/ChGtk.cpp @@ -573,11 +573,11 @@ bool IsEmptyImage(const Image& m) return true; } -Image GtkThemeIcon(const char *name, int size) +Image GtkThemeIcon(const char *name, bool large) { - Image m = GetGTK(gtk__parent(), size, 0, name, GTK_THEMEICON, 0, 0); + int rsz = large ? 48 : 16; + Image m = GetGTK(gtk__parent(), rsz, 0, name, GTK_THEMEICON, 0, 0); Size sz = m.GetSize(); - int rsz = size ? 48 : 16; if(sz.cx > rsz || sz.cy > rsz) m = Rescale(m, rsz, rsz); return m; diff --git a/uppsrc/CtrlLib/FileSel.cpp b/uppsrc/CtrlLib/FileSel.cpp index 8932b446c..d6c8bee2b 100644 --- a/uppsrc/CtrlLib/FileSel.cpp +++ b/uppsrc/CtrlLib/FileSel.cpp @@ -94,7 +94,7 @@ Image GetFileIcon(const String& folder, const String& filename, bool isdir, bool } #else -Image GtkThemeIcon(const char *name, int size); +Image GtkThemeIcon(const char *name, bool large); Image GnomeImage(const char *s, bool large = false) {