|
Gilboa Davara |
7d8d339 |
diff -Naur icewm-1.3.7.bak/src/yicon.cc icewm-1.3.7/src/yicon.cc
|
|
Gilboa Davara |
7d8d339 |
--- icewm-1.3.7.bak/src/yicon.cc 2010-10-31 15:09:36.000000000 +0100
|
|
Gilboa Davara |
7d8d339 |
+++ icewm-1.3.7/src/yicon.cc 2011-11-07 19:41:52.841910531 +0100
|
|
Gilboa Davara |
7d8d339 |
@@ -270,6 +270,10 @@
|
|
Gilboa Davara |
7d8d339 |
iconCache.getItem(0)->removeFromCache();
|
|
Gilboa Davara |
7d8d339 |
}
|
|
Gilboa Davara |
7d8d339 |
|
|
Gilboa Davara |
7d8d339 |
+int YIcon::menuSize() {
|
|
Gilboa Davara |
7d8d339 |
+ return menuIconSize;
|
|
Gilboa Davara |
7d8d339 |
+}
|
|
Gilboa Davara |
7d8d339 |
+
|
|
Gilboa Davara |
7d8d339 |
int YIcon::smallSize() {
|
|
Gilboa Davara |
7d8d339 |
return smallIconSize;
|
|
Gilboa Davara |
7d8d339 |
}
|
|
Gilboa Davara |
7d8d339 |
diff -Naur icewm-1.3.7.bak/src/yicon.h icewm-1.3.7/src/yicon.h
|
|
Gilboa Davara |
7d8d339 |
--- icewm-1.3.7.bak/src/yicon.h 2010-10-31 15:09:36.000000000 +0100
|
|
Gilboa Davara |
7d8d339 |
+++ icewm-1.3.7/src/yicon.h 2011-11-07 19:41:28.555296033 +0100
|
|
Gilboa Davara |
7d8d339 |
@@ -25,6 +25,7 @@
|
|
Gilboa Davara |
7d8d339 |
bool isCached() { return fCached; }
|
|
Gilboa Davara |
7d8d339 |
void setCached(bool cached) { fCached = cached; }
|
|
Gilboa Davara |
7d8d339 |
|
|
Gilboa Davara |
7d8d339 |
+ static int menuSize();
|
|
Gilboa Davara |
7d8d339 |
static int smallSize();
|
|
Gilboa Davara |
7d8d339 |
static int largeSize();
|
|
Gilboa Davara |
7d8d339 |
static int hugeSize();
|
|
Gilboa Davara |
7d8d339 |
diff -Naur icewm-1.3.7.bak/src/ymenu.cc icewm-1.3.7/src/ymenu.cc
|
|
Gilboa Davara |
7d8d339 |
--- icewm-1.3.7.bak/src/ymenu.cc 2010-10-31 15:09:36.000000000 +0100
|
|
Gilboa Davara |
7d8d339 |
+++ icewm-1.3.7/src/ymenu.cc 2011-11-07 19:42:40.498474049 +0100
|
|
Gilboa Davara |
7d8d339 |
@@ -153,8 +153,8 @@
|
|
Gilboa Davara |
7d8d339 |
|
|
Gilboa Davara |
7d8d339 |
#ifndef LITE
|
|
Gilboa Davara |
7d8d339 |
if (getItem(selItem)->getIcon() != null &&
|
|
Gilboa Davara |
7d8d339 |
- YIcon::smallSize() > h)
|
|
Gilboa Davara |
7d8d339 |
- h = YIcon::smallSize();
|
|
Gilboa Davara |
7d8d339 |
+ YIcon::menuSize() > h)
|
|
Gilboa Davara |
7d8d339 |
+ h = YIcon::menuSize();
|
|
Gilboa Davara |
7d8d339 |
#endif
|
|
Gilboa Davara |
7d8d339 |
|
|
Gilboa Davara |
7d8d339 |
if (x <= int(width() - h - 4))
|
|
Gilboa Davara |
7d8d339 |
@@ -1023,8 +1023,8 @@
|
|
Gilboa Davara |
7d8d339 |
mitem->getIcon()->draw(g,
|
|
Gilboa Davara |
7d8d339 |
l + 1 + delta, t + delta + top + pad +
|
|
Gilboa Davara |
7d8d339 |
(eh - top - pad * 2 - bottom -
|
|
Gilboa Davara |
7d8d339 |
- YIcon::smallSize()) / 2,
|
|
Gilboa Davara |
7d8d339 |
- YIcon::smallSize());
|
|
Gilboa Davara |
7d8d339 |
+ YIcon::menuSize()) / 2,
|
|
Gilboa Davara |
7d8d339 |
+ YIcon::menuSize());
|
|
Gilboa Davara |
7d8d339 |
#endif
|
|
Gilboa Davara |
7d8d339 |
}
|
|
Gilboa Davara |
7d8d339 |
|
|
Gilboa Davara |
7d8d339 |
diff -Naur icewm-1.3.7.bak/src/ymenuitem.cc icewm-1.3.7/src/ymenuitem.cc
|
|
Gilboa Davara |
7d8d339 |
--- icewm-1.3.7.bak/src/ymenuitem.cc 2010-10-31 15:09:36.000000000 +0100
|
|
Gilboa Davara |
7d8d339 |
+++ icewm-1.3.7/src/ymenuitem.cc 2011-11-07 19:50:04.458316916 +0100
|
|
Gilboa Davara |
7d8d339 |
@@ -86,8 +86,8 @@
|
|
Gilboa Davara |
7d8d339 |
int ih = fontHeight;
|
|
Gilboa Davara |
7d8d339 |
|
|
Gilboa Davara |
7d8d339 |
#ifndef LITE
|
|
Gilboa Davara |
7d8d339 |
- if (YIcon::smallSize() > ih)
|
|
Gilboa Davara |
7d8d339 |
- ih = YIcon::smallSize();
|
|
Gilboa Davara |
7d8d339 |
+ if (YIcon::menuSize() > ih)
|
|
Gilboa Davara |
7d8d339 |
+ ih = YIcon::menuSize();
|
|
Gilboa Davara |
7d8d339 |
#endif
|
|
Gilboa Davara |
7d8d339 |
|
|
Gilboa Davara |
7d8d339 |
if (wmLook == lookWarp4 || wmLook == lookWin95) {
|
|
Gilboa Davara |
7d8d339 |
@@ -123,7 +123,7 @@
|
|
Gilboa Davara |
7d8d339 |
return 0;
|
|
Gilboa Davara |
7d8d339 |
#else
|
|
Gilboa Davara |
7d8d339 |
ref<YIcon> icon = getIcon();
|
|
Gilboa Davara |
7d8d339 |
- return icon != null ? YIcon::smallSize(): 0;
|
|
Gilboa Davara |
7d8d339 |
+ return icon != null ? YIcon::menuSize(): 0;
|
|
Gilboa Davara |
7d8d339 |
#endif
|
|
Gilboa Davara |
7d8d339 |
}
|
|
Gilboa Davara |
7d8d339 |
|