return false;
applyEdjeStateFromForm(entry->o, controlStatesForRenderer(object));
-
+ if (object && object->hasBackground() && object->style()->visitedDependentColor(CSSPropertyBackgroundColor) != Color::white)
+ edje_object_signal_emit(entry->o, "bg_styled", "");
cairo = info.context->platformContext()->cr();
ASSERT(cairo);
} else
#endif
adjustSizeConstraints(style, ComboBox);
-
+ style->resetBorder();
style->setWhiteSpace(PRE);
}
-#if ENABLE(TIZEN_THEME_STYLE_WORKAROUND)
-const int COMBO_BUTTON_WIDTH = 16;
-
-bool RenderThemeEfl::paintTransparentMenuList(RenderObject* object, const PaintInfo& info, const IntRect& rect)
-{
- GraphicsContext* context = info.context;
- context->save();
-
- // Draw combo button.
- int maxX = rect.maxX();
- Color color = object->style()->visitedDependentColor(CSSPropertyBackgroundColor);
- IntRect graybox(maxX - COMBO_BUTTON_WIDTH - 2, rect.y() + 2, COMBO_BUTTON_WIDTH, rect.height() - 4);
- context->fillRect(graybox, color, ColorSpaceDeviceRGB);
- context->setStrokeColor(Color::gray, ColorSpaceDeviceRGB);
- context->strokeRect(graybox, 1);
-
- // Draw arrow in combo button.
- // 3, 8, 15 is three point of COMBO_BUTTON_WIDTH and -1 pixe is for gap between COMBO_BUTTON and boder.
- int centerYOfRect = rect.y() + rect.height() / 2;
- IntPoint pnt1(maxX - 1 - 15, centerYOfRect - 3);
- IntPoint pnt2(maxX - 1 - 8, centerYOfRect + 5);
- IntPoint pnt3(maxX - 1 - 3, centerYOfRect - 3);
- context->setStrokeThickness(2);
- context->drawLine(pnt1, pnt2);
- context->drawLine(pnt2, pnt3);
- context->restore();
-
- return false;
-}
-#endif
-
bool RenderThemeEfl::paintMenuList(RenderObject* object, const PaintInfo& info, const IntRect& rect)
{
-#if ENABLE(TIZEN_THEME_STYLE_WORKAROUND)
- if (object->hasBackground()) {
- Color color = object->style()->visitedDependentColor(CSSPropertyBackgroundColor);
-
- if (color != Color::white)
- return paintTransparentMenuList(object, info, rect);
- }
-#endif
return paintThemePart(object, ComboBox, info, rect);
}
widget/check/img_check_on_hover.png
widget/check/img_check_on.png
widget/combo/combo.edc
- widget/combo/combo_focus_button.png
- widget/combo/combo_focus.png
- widget/combo/combo_hover_button.png
- widget/combo/combo_hover.png
- widget/combo/combo_normal_button.png
- widget/combo/combo_normal.png
- widget/combo/combo_press_button.png
- widget/combo/combo_press.png
- widget/combo/icon.png
+ widget/combo/00_combo_focus_button.png
+ widget/combo/00_combo_focus.png
+ widget/combo/00_combo_hover_button.png
+ widget/combo/00_combo_hover.png
+ widget/combo/00_combo_normal_button.png
+ widget/combo/00_combo_normal.png
+ widget/combo/00_combo_press_button.png
+ widget/combo/00_combo_press.png
+ widget/combo/00_combo_border.png
+ widget/combo/00_combo_focus_border.png
+ widget/combo/00_combo_hover_border.png
+ widget/combo/00_icon.png
widget/entry/entry.edc
widget/entry/img_focused.png
widget/entry/img_hovered.png
Boston, MA 02110-1301, USA.
*/
-group {
- name: "webkit/widget/combo";
+group { name: "webkit/widget/combo";
+ data { item: "scale" "2"; } /* original combo_size is 64, 29 , original combo_button size is 31, 29 */
images {
- image: "widget/combo/combo_normal.png" COMP;
- image: "widget/combo/combo_normal_button.png" COMP;
- image: "widget/combo/combo_hover.png" COMP;
- image: "widget/combo/combo_hover_button.png" COMP;
- image: "widget/combo/combo_focus.png" COMP;
- image: "widget/combo/combo_focus_button.png" COMP;
- image: "widget/combo/combo_press.png" COMP;
- image: "widget/combo/combo_press_button.png" COMP;
- image: "widget/combo/icon.png" COMP;
+ image: "widget/combo/00_combo_normal.png" COMP;
+ image: "widget/combo/00_combo_normal_button.png" COMP;
+ image: "widget/combo/00_combo_hover.png" COMP;
+ image: "widget/combo/00_combo_hover_button.png" COMP;
+ image: "widget/combo/00_combo_focus.png" COMP;
+ image: "widget/combo/00_combo_focus_button.png" COMP;
+ image: "widget/combo/00_combo_press.png" COMP;
+ image: "widget/combo/00_combo_press_button.png" COMP;
+ image: "widget/combo/00_combo_border.png" COMP;
+ image: "widget/combo/00_combo_focus_border.png" COMP;
+ image: "widget/combo/00_combo_hover_border.png" COMP;
+ image: "widget/combo/00_icon.png" COMP;
}
script {
public isEnabled;
public isPressed;
- public isChecked;
public isFocused;
public isHovered;
+ public isStyled;
public show() {
if (get_int(isEnabled) == 1) {
- set_state(PART:"combo", "default", 0.0);
- set_state(PART:"combo_button", "default", 0.0);
- set_state(PART:"combo_button_icon", "default", 0.0);
if (get_int(isFocused) == 1) {
- set_state(PART:"combo", "focused", 0.0);
- set_state(PART:"combo_button", "focused", 0.0);
if (get_int(isPressed) == 1) {
set_state(PART:"combo", "pressed", 0.0);
set_state(PART:"combo_button", "pressed", 0.0);
}
+ else if (get_int(isStyled) == 1) {
+ set_state(PART:"combo", "styled_focused", 0.0);
+ set_state(PART:"combo_button", "focused", 0.0);
+ }
+ else {
+ set_state(PART:"combo", "focused", 0.0);
+ set_state(PART:"combo_button", "focused", 0.0);
+ }
}
else if (get_int(isHovered) == 1) {
- set_state(PART:"combo", "hovered", 0.0);
- set_state(PART:"combo_button", "hovered", 0.0);
- if (get_int(isPressed) == 1) {
- set_state(PART:"combo", "pressed", 0.0);
- set_state(PART:"combo_button", "pressed", 0.0);
+ if (get_int(isStyled) == 1) {
+ set_state(PART:"combo", "styled_hovered", 0.0);
+ set_state(PART:"combo_button", "hovered", 0.0);
}
+ else {
+ set_state(PART:"combo", "hovered", 0.0);
+ set_state(PART:"combo_button", "hovered", 0.0);
+ }
+ }
+ else if (get_int(isStyled) == 1) {
+ set_state(PART:"combo", "styled", 0.0);
+ set_state(PART:"combo_button", "default", 0.0);
}
+ else {
+ set_state(PART:"combo", "default", 0.0);
+ set_state(PART:"combo_button", "default", 0.0);
+ }
+
+ set_state(PART:"combo_button_icon", "default", 0.0);
}
else {
set_state(PART:"combo", "disabled", 0.0);
rel1.to: "clipper";
rel2 {
to: "clipper";
- offset: -17 -1;
+ offset: -34 -1;
}
}
}
description {
state: "default" 0.0;
image {
- normal: "widget/combo/combo_normal.png";
- border: 0 0 0 0;
+ normal: "widget/combo/00_combo_normal.png";
+ border: 15 0 15 15;
}
}
description {
state: "hovered" 0.0;
inherit: "default" 0.0;
image {
- normal: "widget/combo/combo_hover.png";
- border: 0 0 0 0;
+ normal: "widget/combo/00_combo_hover.png";
+ border: 15 0 15 15;
}
}
description {
state: "focused" 0.0;
inherit: "default" 0.0;
image {
- normal: "widget/combo/combo_focus.png";
- border: 0 0 0 0;
+ normal: "widget/combo/00_combo_focus.png";
+ border: 15 0 15 15;
}
}
description {
state: "pressed" 0.0;
inherit: "default" 0.0;
image {
- normal: "widget/combo/combo_press.png";
- border: 0 0 0 0;
+ normal: "widget/combo/00_combo_press.png";
+ border: 15 0 15 15;
}
}
-
+ description {
+ state: "styled" 0.0;
+ image {
+ normal: "widget/combo/00_combo_border.png";
+ border: 15 0 15 15;
+ }
+ }
+ description {
+ state: "styled_focused" 0.0;
+ image {
+ normal: "widget/combo/00_combo_focus_border.png";
+ border: 15 0 15 15;
+ }
+ }
+ description {
+ state: "styled_hovered" 0.0;
+ image {
+ normal: "widget/combo/00_combo_hover_border.png";
+ border: 15 0 15 15;
+ }
+ }
}
part {
state: "default" 0.0;
rel1.to: "bt_combo_clipper";
image {
- normal: "widget/combo/combo_normal_button.png";
- border: 1 0 0 0;
+ normal: "widget/combo/00_combo_normal_button.png";
+ border: 0 15 15 15;
}
}
description {
inherit: "default" 0.0;
rel1.to: "bt_combo_clipper";
image {
- normal: "widget/combo/combo_hover_button.png";
- border: 1 0 0 0;
+ normal: "widget/combo/00_combo_hover_button.png";
+ border: 0 15 15 15;
}
}
description {
inherit: "default" 0.0;
rel1.to: "bt_combo_clipper";
image {
- normal: "widget/combo/combo_focus_button.png";
- border: 1 0 0 0;
+ normal: "widget/combo/00_combo_focus_button.png";
+ border: 0 15 15 15;
}
}
description {
inherit: "default" 0.0;
rel1.to: "bt_combo_clipper";
image {
- normal: "widget/combo/combo_press_button.png";
- border: 1 0 0 0;
+ normal: "widget/combo/00_combo_press_button.png";
+ border: 0 15 15 15;
}
}
}
clip_to: "bt_combo_clipper";
description {
state: "default" 0.0;
- min: 12 10;
- max: 12 10;
+ min: 24 20;
+ max: 24 20;
color: 255 255 255 150;
rel1 {
to: "bt_combo_clipper";
relative: 0.5 0.5;
- offset: -6 -5;
}
rel2 {
to: "bt_combo_clipper";
relative: 0.5 0.5;
- offset: 6 5;
}
fixed: 1 1;
- image {
- normal: "widget/combo/icon.png";
- border: 0 0 0 0;
- }
+ image.normal: "widget/combo/00_icon.png";
}
description {
state: "disabled" 0.0;
inherit: "default" 0.0;
color: 255 255 255 50;
- image {
- normal: "widget/combo/icon.png";
- border: 0 0 0 0;
- }
}
}
color: 0 0 0 0;
rel1 {
to: "combo_clipper";
- offset: 5 2;
+ offset: 3 3;
}
rel2 {
to: "combo_clipper";
}
}
program {
+ name: "styled_state";
+ signal: "bg_styled";
+ script {
+ set_int(isStyled, 1);
+ show();
+ }
+ }
+ program {
name: "reset";
signal: "reset";
script {
set_int(isEnabled, 0);
set_int(isPressed, 0);
- set_int(isChecked, 0);
set_int(isFocused, 0);
set_int(isHovered, 0);
+ set_int(isStyled, 0);
show();
}
}