+2010-08-11 Rafael Antognolli <antognolli@profusion.mobi>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [EFL] Adding new theme for widgets.
+ https://bugs.webkit.org/show_bug.cgi?id=43860
+
+ Original theme was there for a long time. This is a new
+ fresh one.
+
+ * DefaultTheme/default.edc:
+ * DefaultTheme/widget/button/button.edc:
+ * DefaultTheme/widget/button/img_button_focus.png:
+ * DefaultTheme/widget/button/img_button_hover.png:
+ * DefaultTheme/widget/button/img_button_normal.png:
+ * DefaultTheme/widget/button/img_button_press.png:
+ * DefaultTheme/widget/check/check.edc:
+ * DefaultTheme/widget/check/img_check_off.png:
+ * DefaultTheme/widget/check/img_check_off_focus.png:
+ * DefaultTheme/widget/check/img_check_off_hover.png:
+ * DefaultTheme/widget/check/img_check_on.png:
+ * DefaultTheme/widget/check/img_check_on_focus.png:
+ * DefaultTheme/widget/check/img_check_on_hover.png:
+ * DefaultTheme/widget/combo/combo.edc:
+ * DefaultTheme/widget/combo/combo_focus.png:
+ * DefaultTheme/widget/combo/combo_focus_button.png:
+ * DefaultTheme/widget/combo/combo_hover.png:
+ * DefaultTheme/widget/combo/combo_hover_button.png:
+ * DefaultTheme/widget/combo/combo_normal.png:
+ * DefaultTheme/widget/combo/combo_normal_button.png:
+ * DefaultTheme/widget/combo/combo_press.png:
+ * DefaultTheme/widget/combo/combo_press_button.png:
+ * DefaultTheme/widget/combo/icon.png:
+ * DefaultTheme/widget/entry/img_focused.png:
+ * DefaultTheme/widget/entry/img_hovered.png:
+ * DefaultTheme/widget/entry/img_normal.png:
+ * DefaultTheme/widget/file/file_focus.png:
+ * DefaultTheme/widget/file/file_hover.png:
+ * DefaultTheme/widget/file/file_normal.png:
+ * DefaultTheme/widget/file/file_press.png:
+ * DefaultTheme/widget/radio/img_radio_off.png:
+ * DefaultTheme/widget/radio/img_radio_off_focus.png:
+ * DefaultTheme/widget/radio/img_radio_off_hover.png:
+ * DefaultTheme/widget/radio/img_radio_on.png:
+ * DefaultTheme/widget/radio/img_radio_on_focus.png:
+ * DefaultTheme/widget/radio/img_radio_on_hover.png:
+ * DefaultTheme/widget/radio/radio.edc:
+ * DefaultTheme/widget/scrollbar/scrollbar.edc:
+ * DefaultTheme/widget/scrollbar/scrollbar_h.png:
+ * DefaultTheme/widget/scrollbar/scrollbar_hilight.png: Removed.
+ * DefaultTheme/widget/scrollbar/scrollbar_knob_h.png:
+ * DefaultTheme/widget/scrollbar/scrollbar_knob_v.png:
+ * DefaultTheme/widget/scrollbar/scrollbar_v.png:
+ * DefaultTheme/widget/search/cancel/cancel_normal_button2.png:
+ * DefaultTheme/widget/search/decoration/decoration_normal_button.png:
+ * DefaultTheme/widget/search/field/field_focused.png:
+ * DefaultTheme/widget/search/field/field_hovered.png:
+ * DefaultTheme/widget/search/field/field_normal.png:
+ * DefaultTheme/widget/slider/slider.edc:
+ * DefaultTheme/widget/slider/slider_fill_h.png: Added.
+ * DefaultTheme/widget/slider/slider_fill_v.png: Added.
+ * DefaultTheme/widget/slider/slider_h.png:
+ * DefaultTheme/widget/slider/slider_hilight.png: Removed.
+ * DefaultTheme/widget/slider/slider_knob_h.png:
+ * DefaultTheme/widget/slider/slider_knob_press_h.png: Added.
+ * DefaultTheme/widget/slider/slider_knob_press_v.png: Added.
+ * DefaultTheme/widget/slider/slider_knob_v.png:
+ * DefaultTheme/widget/slider/slider_v.png:
+
2010-08-12 Rafael Antognolli <antognolli@profusion.mobi>
Reviewed by Kenneth Rohde Christiansen.
group {
name: "webkit/widget/slider/vertical";
- min: 10 0; /* if > 0, this is the minimum size that will be allocated.
+ min: 11 0; /* if > 0, this is the minimum size that will be allocated.
* If wants to draw on top, just overflow usign edje's rel1/rel2
*/
+ max: 11 999999;
images {
image: "widget/slider/slider_v.png" COMP;
image: "widget/slider/slider_knob_v.png" COMP;
+ image: "widget/slider/slider_knob_press_v.png" COMP;
+ image: "widget/slider/slider_fill_v.png" COMP;
}
script {
- public message(Msg_Type:type, id, ...) {
- if ((id == 0) && (type == MSG_FLOAT_SET)) {
- new Float:vy, Float:sy;
+ public isEnabled;
+ public isPressed;
+ public isChecked;
+ public isFocused;
+ public isHovered;
- vy = getfarg(2);
- sy = getfarg(3);
+ public show() {
- if (vy >= 0.0) {
- set_drag_size(PART:"img.knob", 1.0, sy);
- set_drag(PART:"img.knob", 0.0, vy);
- }
- }
- }
+ if (get_int(isEnabled) == 1) {
+ set_state(PART:"img.knob", "default", 0.0);
+ if (get_int(isFocused) == 1) {
+ set_state(PART:"img.knob", "pressed", 0.0);
+ if (get_int(isPressed) == 1)
+ set_state(PART:"img.knob", "pressed", 0.0);
+ }
+ else if (get_int(isHovered) == 1) {
+ set_state(PART:"img.knob", "pressed", 0.0);
+ if (get_int(isPressed) == 1)
+ set_state(PART:"img.knob", "pressed", 0.0);
+ }
+ }
+ else
+ set_state(PART:"img.knob", "default", 0.0);
+ }
- public update_drag_pos() {
- new Float:x, Float:y;
- get_drag(PART:"img.knob", x, y);
- send_message(MSG_FLOAT, 1, y);
- }
+ public message(Msg_Type:type, id, ...) {
+ if ((id == 0) && (type == MSG_FLOAT_SET)) {
+ new Float:vy, Float:sy;
+
+ vy = getfarg(2);
+ sy = getfarg(3);
+
+ if (vy >= 0.0) {
+ set_drag_size(PART:"img.knob", 1.0, sy);
+ set_drag(PART:"img.knob", 0.0, vy);
+ run_program(PROGRAM:"show");
+ } else
+ run_program(PROGRAM:"hide");
+ }
+ }
+
+ public update_drag_pos() {
+ new Float:x, Float:y;
+ get_drag(PART:"img.knob", x, y);
+ send_message(MSG_FLOAT, 1, y);
+ }
}
parts {
name: "rect.base";
type: RECT;
description {
- min: 10 0;
- max: 10 999999;
+ min: 11 29;
+ max: 11 999999;
state: "default" 0.0;
color: 255 255 255 0;
}
state: "default" 0.0;
color: 255 255 255 255;
}
+ description {
+ state: "hidden" 0.0;
+ color: 255 255 255 128;
+ }
}
part {
clip_to: "rect.clipper";
description {
state: "default" 0.0;
+ min: 5 29;
+ max: 5 999999;
+ rel1.to: "rect.base";
+ rel2.to: "rect.base";
image {
normal: "widget/slider/slider_v.png";
- border: 0 0 6 6;
+ border: 0 0 5 5;
+ }
+ }
+ }
+
+ part {
+ name: "img.slider_fill";
+ type: IMAGE;
+ mouse_events: 0;
+ clip_to: "rect.clipper";
+ description {
+ state: "default" 0.0;
+ min: 5 29;
+ max: 5 999999;
+ rel1.to: "img.knob";
+ rel2.to: "rect.base";
+ align: 0.5 0.5;
+ image {
+ normal: "widget/slider/slider_fill_v.png";
+ border: 0 0 5 5;
}
}
}
clip_to: "rect.clipper";
dragable {
x: 0 0 0;
- y: 1 1 0;
+ y: 1 1 1;
confine: "rect.base";
}
description {
state: "default" 0.0;
- min: 10 10;
- max: 10 999999;
+ min: 11 29;
+ align: 0.5 0.5;
image {
normal: "widget/slider/slider_knob_v.png";
border: 0 0 6 6;
}
}
+ description {
+ state: "pressed" 0.0;
+ inherit: "default" 0.0;
+ image.normal: "widget/slider/slider_knob_press_v.png";
+ }
}
}
programs {
+ program {
+ name: "load";
+ signal: "load";
+ action: STATE_SET "hidden" 0.0;
+ target: "rect.clipper";
+ }
+ program {
+ name: "hide";
+ action: STATE_SET "hidden" 0.0;
+ transition: ACCELERATE 0.5;
+ target: "rect.clipper";
+ }
+
+ program {
+ name: "show";
+ action: STATE_SET "default" 0.0;
+ target: "rect.clipper";
+ }
+
program {
name: "dragged";
signal: "drag";
update_drag_pos();
}
}
+
+ program {
+ name: "enabled";
+ signal: "enabled";
+ script {
+ set_int(isEnabled, 1);
+ show();
+ }
+ }
+ program {
+ name: "pressed";
+ signal: "pressed";
+ script {
+ set_int(isPressed, 1);
+ show();
+ }
+ }
+ program {
+ name: "checked";
+ signal: "checked";
+ script {
+ set_int(isChecked, 1);
+ show();
+ }
+ }
+ program {
+ name: "focused";
+ signal: "focused";
+ script {
+ set_int(isFocused, 1);
+ show();
+ }
+ }
+ program {
+ name: "hovered";
+ signal: "hovered";
+ script {
+ set_int(isHovered, 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);
+ show();
+ }
+ }
}
}
group {
name: "webkit/widget/slider/horizontal";
- min: 0 10; /* if > 0, this is the minimum size that will be allocated.
+ min: 0 11; /* if > 0, this is the minimum size that will be allocated.
* If wants to draw on top, just overflow usign edje's rel1/rel2
*/
+ max: 999999 11;
images {
image: "widget/slider/slider_h.png" COMP;
image: "widget/slider/slider_knob_h.png" COMP;
+ image: "widget/slider/slider_knob_press_h.png" COMP;
+ image: "widget/slider/slider_fill_h.png" COMP;
}
script {
- public message(Msg_Type:type, id, ...) {
- if ((id == 0) && (type == MSG_FLOAT_SET)) {
- new Float:vx, Float:sx;
+ public isEnabled;
+ public isPressed;
+ public isChecked;
+ public isFocused;
+ public isHovered;
- vx = getfarg(2);
- sx = getfarg(3);
+ public show() {
- if (vx >= 0.0) {
- set_drag_size(PART:"img.knob", sx, 1.0);
- set_drag(PART:"img.knob", vx, 0.0);
- }
- }
- }
+ if (get_int(isEnabled) == 1) {
+ set_state(PART:"img.knob", "default", 0.0);
+ if (get_int(isFocused) == 1) {
+ set_state(PART:"img.knob", "pressed", 0.0);
+ if (get_int(isPressed) == 1)
+ set_state(PART:"img.knob", "pressed", 0.0);
+ }
+ else if (get_int(isHovered) == 1) {
+ set_state(PART:"img.knob", "pressed", 0.0);
+ if (get_int(isPressed) == 1)
+ set_state(PART:"img.knob", "pressed", 0.0);
+ }
+ }
+ else
+ set_state(PART:"img.knob", "default", 0.0);
+ }
- public update_drag_pos() {
- new Float:x, Float:y;
- get_drag(PART:"img.knob", x, y);
- send_message(MSG_FLOAT, 1, x);
- }
+ public message(Msg_Type:type, id, ...) {
+ if ((id == 0) && (type == MSG_FLOAT_SET)) {
+ new Float:vx, Float:sx;
+
+ vx = getfarg(2);
+ sx = getfarg(3);
+
+ if (vx >= 0.0) {
+ set_drag_size(PART:"img.knob", sx, 1.0);
+ set_drag(PART:"img.knob", vx, 0.0);
+ run_program(PROGRAM:"show");
+ } else
+ run_program(PROGRAM:"hide");
+ }
+ }
+
+ public update_drag_pos() {
+ new Float:x, Float:y;
+ get_drag(PART:"img.knob", x, y);
+ send_message(MSG_FLOAT, 1, x);
+ }
}
parts {
type: RECT;
description {
state: "default" 0.0;
- min: 0 10;
- max: 999999 10;
+ min: 29 11;
+ max: 999999 11;
color: 255 255 255 0;
}
}
state: "default" 0.0;
color: 255 255 255 255;
}
+ description {
+ state: "hidden" 0.0;
+ color: 255 255 255 128;
+ }
}
part {
clip_to: "rect.clipper";
description {
state: "default" 0.0;
+ min: 29 5;
+ max: 999999 5;
+ rel1.to: "rect.base";
+ rel2.to: "rect.base";
+ align: 0.5 0.5;
image {
normal: "widget/slider/slider_h.png";
- border: 6 6 0 0;
+ border: 5 5 0 0;
+ }
+ }
+ }
+
+ part {
+ name: "img.slider_fill";
+ type: IMAGE;
+ mouse_events: 0;
+ clip_to: "rect.clipper";
+ description {
+ state: "default" 0.0;
+ min: 29 5;
+ max: 999999 5;
+ rel1.to: "rect.base";
+ rel2.to: "img.knob";
+ align: 0.5 0.5;
+ image {
+ normal: "widget/slider/slider_fill_h.png";
+ border: 5 5 0 0;
}
}
}
}
description {
state: "default" 0.0;
- min: 10 10;
+ min: 29 11;
+ align: 0.5 0.5;
image {
normal: "widget/slider/slider_knob_h.png";
border: 6 6 0 0;
}
}
+ description {
+ state: "pressed" 0.0;
+ inherit: "default" 0.0;
+ image.normal: "widget/slider/slider_knob_press_h.png";
+ }
}
}
programs {
+ program {
+ name: "load";
+ signal: "load";
+ action: STATE_SET "hidden" 0.0;
+ target: "rect.clipper";
+ }
+ program {
+ name: "hide";
+ action: STATE_SET "hidden" 0.0;
+ transition: ACCELERATE 0.5;
+ target: "rect.clipper";
+ }
+
+ program {
+ name: "show";
+ action: STATE_SET "default" 0.0;
+ target: "rect.clipper";
+ }
+
program {
name: "dragged";
signal: "drag";
update_drag_pos();
}
}
+
+ program {
+ name: "enabled";
+ signal: "enabled";
+ script {
+ set_int(isEnabled, 1);
+ show();
+ }
+ }
+ program {
+ name: "pressed";
+ signal: "pressed";
+ script {
+ set_int(isPressed, 1);
+ show();
+ }
+ }
+ program {
+ name: "checked";
+ signal: "checked";
+ script {
+ set_int(isChecked, 1);
+ show();
+ }
+ }
+ program {
+ name: "focused";
+ signal: "focused";
+ script {
+ set_int(isFocused, 1);
+ show();
+ }
+ }
+ program {
+ name: "hovered";
+ signal: "hovered";
+ script {
+ set_int(isHovered, 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);
+ show();
+ }
+ }
}
}
git://git.webkit.org / WebKit-https.git / commitdiff
