Extend ErrorBox themeable properties
Make font, color and background color properties of description area
themeable.
342140: Customizable error message box
https://bugs.eclipse.org/bugs/show_bug.cgi?id=342140
Change-Id: I0b3a477571e4c4e96736dfc60657318ac2bfb361
Signed-off-by: Elshad Seyidmammadov <elshad@eclipsesource.com>
diff --git a/bundles/org.eclipse.rap.rwt/js/rwt/runtime/ErrorHandler.js b/bundles/org.eclipse.rap.rwt/js/rwt/runtime/ErrorHandler.js
index 754a25f..1d7961b 100644
--- a/bundles/org.eclipse.rap.rwt/js/rwt/runtime/ErrorHandler.js
+++ b/bundles/org.eclipse.rap.rwt/js/rwt/runtime/ErrorHandler.js
@@ -245,6 +245,11 @@
_createErrorBoxDescriptionArea : function( parentElement ) {
var element = document.createElement( "div" );
+ var themeStore = rwt.theme.ThemeStore.getInstance();
+ var cssElement = "ErrorBox";
+ var color = themeStore.getColor( cssElement, {}, "color" );
+ var font = themeStore.getFont( cssElement, {}, "font" );
+ var backgroundColor = themeStore.getColor( cssElement, {}, "background-color" );
var style = element.style;
style.position = "absolute";
style.left = "0px";
@@ -254,9 +259,9 @@
style.padding = "10px";
style.overflow = "auto";
style.textAlign = "left";
- style.backgroundColor = "white";
- style.color = "#4a4a4a";
- style.fontSize = "14px";
+ style.font = font.toCss();
+ style.color = color;
+ style.backgroundColor = backgroundColor;
parentElement.appendChild( element );
return element;
},
diff --git a/bundles/org.eclipse.rap.rwt/resources/resource/theme/default.css b/bundles/org.eclipse.rap.rwt/resources/resource/theme/default.css
index 49142c3..77a203d 100644
--- a/bundles/org.eclipse.rap.rwt/resources/resource/theme/default.css
+++ b/bundles/org.eclipse.rap.rwt/resources/resource/theme/default.css
@@ -98,6 +98,9 @@
ErrorBox {
border: 1px solid #3B5998;
+ font: 14px Verdana, "Lucida Sans", Arial, Helvetica, sans-serif;
+ color: #4a4a4a;
+ background-color: white;
}
/* Default theme for all controls */
diff --git a/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/widgetkit/Widget.default.css b/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/widgetkit/Widget.default.css
index 71940b8..c56f5bc 100644
--- a/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/widgetkit/Widget.default.css
+++ b/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/widgetkit/Widget.default.css
@@ -83,4 +83,7 @@
ErrorBox {
border: 1px solid #3B5998;
+ font: 14px Verdana, "Lucida Sans", Arial, Helvetica, sans-serif;
+ color: #4a4a4a;
+ background-color: white;
}
diff --git a/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/widgetkit/Widget.theme.xml b/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/widgetkit/Widget.theme.xml
index e11931c..79a34db 100644
--- a/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/widgetkit/Widget.theme.xml
+++ b/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/widgetkit/Widget.theme.xml
@@ -343,6 +343,24 @@
</description>
</property>
+ <property name="font">
+ <description>
+ Text font of the description area.
+ </description>
+ </property>
+
+ <property name="color">
+ <description>
+ Text color of the description area.
+ </description>
+ </property>
+
+ <property name="background-color">
+ <description>
+ Background color of the description area.
+ </description>
+ </property>
+
</element>
</theme>
diff --git a/tests/org.eclipse.rap.rwt.themes.test/src/org/eclipse/rap/rwt/themes/test/rwtdefault/Widget.test.css b/tests/org.eclipse.rap.rwt.themes.test/src/org/eclipse/rap/rwt/themes/test/rwtdefault/Widget.test.css
index 1af956d..8b77839 100644
--- a/tests/org.eclipse.rap.rwt.themes.test/src/org/eclipse/rap/rwt/themes/test/rwtdefault/Widget.test.css
+++ b/tests/org.eclipse.rap.rwt.themes.test/src/org/eclipse/rap/rwt/themes/test/rwtdefault/Widget.test.css
@@ -76,4 +76,7 @@
ErrorBox {
border: 1px solid #3B5998;
+ font: 14px Verdana, "Lucida Sans", Arial, Helvetica, sans-serif;
+ color: #4a4a4a;
+ background-color: white;
}
