#897 classic ui fixed

This commit is contained in:
honfika@gmail.com
2015-05-23 00:37:40 +02:00
parent 5369f13cfb
commit 0d7220a87a
4 changed files with 70 additions and 48 deletions

View File

@@ -100,8 +100,14 @@ import org.pushingpixels.substance.internal.utils.SubstanceColorSchemeUtilities;
*/
public class View {
private static final Color DEFAULT_BACKGROUND_COLOR = new Color(217, 231, 250);
public static Color getDefaultBackgroundColor() {
return SubstanceLookAndFeel.getCurrentSkin().getColorScheme(DecorationAreaType.GENERAL, ColorSchemeAssociationKind.FILL, ComponentState.ENABLED).getBackgroundFillColor();
if (Configuration.useRibbonInterface.get()) {
return SubstanceLookAndFeel.getCurrentSkin().getColorScheme(DecorationAreaType.GENERAL, ColorSchemeAssociationKind.FILL, ComponentState.ENABLED).getBackgroundFillColor();
} else {
return DEFAULT_BACKGROUND_COLOR;
}
}
private static Color swfBackgroundColor = null;
@@ -282,17 +288,26 @@ public class View {
* @param f Frame to set icon in
*/
public static void setWindowIcon(Window f) {
List<Image> images = new ArrayList<>();
MyResizableIcon[] icons = MyRibbonApplicationMenuButtonUI.getIcons();
MyResizableIcon icon = icons[1];
int sizes[] = new int[]{16, 32, 48, 256};
for (int size : sizes) {
icon.setIconSize(size, size);
BufferedImage bi = new BufferedImage(size, size, BufferedImage.TYPE_4BYTE_ABGR);
icon.paintIcon(f, bi.getGraphics(), 0, 0);
images.add(bi);
if (Configuration.useRibbonInterface.get()) {
List<Image> images = new ArrayList<>();
MyResizableIcon[] icons = MyRibbonApplicationMenuButtonUI.getIcons();
MyResizableIcon icon = icons[1];
int sizes[] = new int[]{16, 32, 48, 256};
for (int size : sizes) {
icon.setIconSize(size, size);
BufferedImage bi = new BufferedImage(size, size, BufferedImage.TYPE_4BYTE_ABGR);
icon.paintIcon(f, bi.getGraphics(), 0, 0);
images.add(bi);
}
f.setIconImages(images);
} else {
List<Image> images = new ArrayList<>();
images.add(loadImage("icon16"));
images.add(loadImage("icon32"));
images.add(loadImage("icon48"));
images.add(loadImage("icon256"));
f.setIconImages(images);
}
f.setIconImages(images);
}
/**