selecting appropriate icon size for ribbon/nonribbon

This commit is contained in:
Jindra Petřík
2015-05-24 16:53:07 +02:00
parent b18d909c80
commit a85adfd4d5
8 changed files with 36 additions and 7 deletions

View File

@@ -228,10 +228,10 @@ public class MainFrameRibbonMenu extends MainFrameMenu {
if (sub.startsWith("_/$")) //FooterMenu
{
RibbonApplicationMenuEntryFooter footerMenu = new RibbonApplicationMenuEntryFooter(View.getResizableIcon(subIcon), subTitle, subAction);
RibbonApplicationMenuEntryFooter footerMenu = new RibbonApplicationMenuEntryFooter(View.getResizableIcon(subIcon, 16), subTitle, subAction);
mainMenu.addFooterEntry(footerMenu);
} else {
RibbonApplicationMenuEntryPrimary menu = new RibbonApplicationMenuEntryPrimary(View.getResizableIcon(subIcon), subTitle, subAction,
RibbonApplicationMenuEntryPrimary menu = new RibbonApplicationMenuEntryPrimary(View.getResizableIcon(subIcon, 32), subTitle, subAction,
subType == TYPE_MENU ? JCommandButton.CommandButtonKind.ACTION_AND_POPUP_MAIN_ACTION : JCommandButton.CommandButtonKind.ACTION_ONLY);
if (subLoader != null) {
@@ -260,12 +260,13 @@ public class MainFrameRibbonMenu extends MainFrameMenu {
String subTitle = menuTitles.get(sub);
String subIcon = menuIcons.get(sub);
String subGroup = menuGroup.get(sub);
int subPriority = menuPriorities.get(sub);
final ActionListener subLoader = menuLoaders.get(sub);
AbstractCommandButton but = null;
if (subType == TYPE_MENUITEM || (subType == TYPE_MENU && subAction != null)) {
JCommandButton cbut = null;
if (subIcon != null) {
cbut = new JCommandButton(fixCommandTitle(subTitle), View.getResizableIcon(subIcon));
cbut = new JCommandButton(fixCommandTitle(subTitle), View.getResizableIcon(subIcon, subPriority == PRIORITY_TOP ? 32 : 16));
} else {
cbut = new JCommandButton(fixCommandTitle(subTitle));
}
@@ -293,7 +294,7 @@ public class MainFrameRibbonMenu extends MainFrameMenu {
menuItems.put(sub, cb);
} else {
if (subIcon != null) {
but = new JCommandToggleButton(fixCommandTitle(subTitle), View.getResizableIcon(subIcon));
but = new JCommandToggleButton(fixCommandTitle(subTitle), View.getResizableIcon(subIcon, subPriority == PRIORITY_TOP ? 32 : 16));
} else {
but = new JCommandToggleButton(fixCommandTitle(subTitle));
}
@@ -310,7 +311,7 @@ public class MainFrameRibbonMenu extends MainFrameMenu {
//if (parts.length == 3)
{ //3rd level - it's a Band!
JRibbonBand band = new JRibbonBand(title, icon != null ? View.getResizableIcon(icon) : null, null);
JRibbonBand band = new JRibbonBand(title, icon != null ? View.getResizableIcon(icon, 16) : null, null);
band.setResizePolicies(getResizePolicies(band));
int cnt = 0;
for (String sub : subs) {