提交 8bc0c3da 编写于 作者: S stooke

8214765: All TrayIcon MessageType icons does not show up with gtk3 option set

Reviewed-by: serb, psadhukhan, clanger
上级 8b0109ca
...@@ -414,12 +414,24 @@ public abstract class InfoWindow extends Window { ...@@ -414,12 +414,24 @@ public abstract class InfoWindow extends Window {
private void loadGtkImages() { private void loadGtkImages() {
if (!gtkImagesLoaded) { if (!gtkImagesLoaded) {
errorImage = (Image)Toolkit.getDefaultToolkit().getDesktopProperty( //check whether the gtk version is >= 3.10 as the Icon names were
"gtk.icon.gtk-dialog-error.6.rtl"); //changed from this release
warnImage = (Image)Toolkit.getDefaultToolkit().getDesktopProperty( UNIXToolkit tk = (UNIXToolkit) Toolkit.getDefaultToolkit();
"gtk.icon.gtk-dialog-warning.6.rtl"); if (tk.checkGtkVersion(3, 10, 0)) {
infoImage = (Image)Toolkit.getDefaultToolkit().getDesktopProperty( errorImage = (Image) tk.getDesktopProperty(
"gtk.icon.gtk-dialog-info.6.rtl"); "gtk.icon.dialog-error.6.rtl");
warnImage = (Image) tk.getDesktopProperty(
"gtk.icon.dialog-warning.6.rtl");
infoImage = (Image) tk.getDesktopProperty(
"gtk.icon.dialog-information.6.rtl");
} else {
errorImage = (Image) tk.getDesktopProperty(
"gtk.icon.gtk-dialog-error.6.rtl");
warnImage = (Image) tk.getDesktopProperty(
"gtk.icon.gtk-dialog-warning.6.rtl");
infoImage = (Image) tk.getDesktopProperty(
"gtk.icon.gtk-dialog-info.6.rtl");
}
gtkImagesLoaded = true; gtkImagesLoaded = true;
} }
} }
...@@ -492,4 +504,3 @@ public abstract class InfoWindow extends Window { ...@@ -492,4 +504,3 @@ public abstract class InfoWindow extends Window {
} }
} }
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册