summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorWonguk Jeong <wonguk.jeong@samsung.com>2014-07-23 07:07:01 +0900
committerWonguk Jeong <wonguk.jeong@samsung.com>2014-07-23 07:07:01 +0900
commitb14042aa498bff1f1fe791d9014e403e769219ae (patch)
tree9e50b9911998538685fb7430118c9388a2630790 /data
parent922940005a2faeb1dde2d16088f67f2bf08fa58d (diff)
media: improve media control pos/vol slider
Summary: currently, pos/vol could be changed by using only knob not slider area. use slider area as event source, and control knob internally. Fixes T1440 Test Plan: terminology -> tycat video file -> try to control pos/vol by clicking slider area Reviewers: billiob Subscribers: seoz Maniphest Tasks: T1440 Differential Revision: https://phab.enlightenment.org/D1219
Diffstat (limited to 'data')
-rw-r--r--data/themes/default.edc76
-rw-r--r--data/themes/nyanology/default.edc76
-rw-r--r--data/themes/nyanology/nyanology.edc76
3 files changed, 216 insertions, 12 deletions
diff --git a/data/themes/default.edc b/data/themes/default.edc
index cc40979..fe153f5 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -3346,7 +3346,7 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target:
3346 } 3346 }
3347 } 3347 }
3348 part { name: "posline"; 3348 part { name: "posline";
3349 mouse_events: 0; 3349 mouse_events: 1;
3350 repeat_events: 1; 3350 repeat_events: 1;
3351 clip_to: "media_clip"; 3351 clip_to: "media_clip";
3352 description { state: "default" 0.0; 3352 description { state: "default" 0.0;
@@ -3361,7 +3361,7 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target:
3361 } 3361 }
3362 } 3362 }
3363 part { name: "terminology.posdrag"; 3363 part { name: "terminology.posdrag";
3364 mouse_events: 1; 3364 mouse_events: 0;
3365 repeat_events: 1; 3365 repeat_events: 1;
3366 clip_to: "media_clip"; 3366 clip_to: "media_clip";
3367 dragable { 3367 dragable {
@@ -3379,7 +3379,7 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target:
3379 } 3379 }
3380 } 3380 }
3381 part { name: "volline"; 3381 part { name: "volline";
3382 mouse_events: 0; 3382 mouse_events: 1;
3383 repeat_events: 1; 3383 repeat_events: 1;
3384 clip_to: "media_clip"; 3384 clip_to: "media_clip";
3385 description { state: "default" 0.0; 3385 description { state: "default" 0.0;
@@ -3399,7 +3399,7 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target:
3399 } 3399 }
3400 } 3400 }
3401 part { name: "terminology.voldrag"; type: IMAGE; 3401 part { name: "terminology.voldrag"; type: IMAGE;
3402 mouse_events: 1; 3402 mouse_events: 0;
3403 repeat_events: 1; 3403 repeat_events: 1;
3404 clip_to: "media_clip"; 3404 clip_to: "media_clip";
3405 dragable { 3405 dragable {
@@ -3464,6 +3464,74 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target:
3464 action: STATE_SET "default" 0.0; 3464 action: STATE_SET "default" 0.0;
3465 target: "terminology.voldrag"; 3465 target: "terminology.voldrag";
3466 } 3466 }
3467 program {
3468 signal: "mouse,down,1"; source: "posline";
3469 filter: "terminology.posdrag" "default";
3470 script {
3471 new x, y, w, h, m_x, m_y;
3472 new Float:pos;
3473
3474 get_geometry(PART:"posline", x, y, w, h);
3475 get_mouse(m_x, m_y);
3476 pos = m_x - x;
3477 pos = pos / w;
3478 set_drag(PART:"terminology.posdrag", pos, 0.0);
3479 emit("pos,drag,start", "");
3480
3481 }
3482 }
3483 program {
3484 signal: "mouse,up,1"; source: "posline";
3485 action: SIGNAL_EMIT "pos,drag,stop" "";
3486 }
3487 program {
3488 signal: "mouse,move"; source: "posline";
3489 script {
3490 new x, y, w, h, m_x, m_y;
3491 new Float:pos;
3492
3493 if (!get_mouse_buttons()) return;
3494
3495 get_geometry(PART:"posline", x, y, w, h);
3496 get_mouse(m_x, m_y);
3497 pos = m_x - x;
3498 pos = pos / w;
3499 set_drag(PART:"terminology.posdrag", pos, 0.0);
3500 emit("pos,drag", "");
3501 }
3502 }
3503 program {
3504 signal: "mouse,down,1"; source: "volline";
3505 filter: "terminology.voldrag" "default";
3506 script {
3507 new x, y, w, h, m_x, m_y;
3508 new Float:pos;
3509
3510 get_geometry(PART:"volline", x, y, w, h);
3511 get_mouse(m_x, m_y);
3512 pos = m_x - x;
3513 pos = pos / w;
3514 set_drag(PART:"terminology.voldrag", pos, 0.0);
3515 emit("vol,drag", "");
3516
3517 }
3518 }
3519 program {
3520 signal: "mouse,move"; source: "volline";
3521 script {
3522 new x, y, w, h, m_x, m_y;
3523 new Float:pos;
3524
3525 if (!get_mouse_buttons()) return;
3526
3527 get_geometry(PART:"volline", x, y, w, h);
3528 get_mouse(m_x, m_y);
3529 pos = m_x - x;
3530 pos = pos / w;
3531 set_drag(PART:"terminology.voldrag", pos, 0.0);
3532 emit("vol,drag", "");
3533 }
3534 }
3467 } 3535 }
3468 } 3536 }
3469 3537
diff --git a/data/themes/nyanology/default.edc b/data/themes/nyanology/default.edc
index cb04970..1a2184c 100644
--- a/data/themes/nyanology/default.edc
+++ b/data/themes/nyanology/default.edc
@@ -2502,7 +2502,7 @@ target: "4.bottom"
2502 } 2502 }
2503 } 2503 }
2504 part { name: "posline"; 2504 part { name: "posline";
2505 mouse_events: 0; 2505 mouse_events: 1;
2506 repeat_events: 1; 2506 repeat_events: 1;
2507 clip_to: "media_clip"; 2507 clip_to: "media_clip";
2508 description { state: "default" 0.0; 2508 description { state: "default" 0.0;
@@ -2517,7 +2517,7 @@ target: "4.bottom"
2517 } 2517 }
2518 } 2518 }
2519 part { name: "terminology.posdrag"; 2519 part { name: "terminology.posdrag";
2520 mouse_events: 1; 2520 mouse_events: 0;
2521 repeat_events: 1; 2521 repeat_events: 1;
2522 clip_to: "media_clip"; 2522 clip_to: "media_clip";
2523 dragable { 2523 dragable {
@@ -2535,7 +2535,7 @@ target: "4.bottom"
2535 } 2535 }
2536 } 2536 }
2537 part { name: "volline"; 2537 part { name: "volline";
2538 mouse_events: 0; 2538 mouse_events: 1;
2539 repeat_events: 1; 2539 repeat_events: 1;
2540 clip_to: "media_clip"; 2540 clip_to: "media_clip";
2541 description { state: "default" 0.0; 2541 description { state: "default" 0.0;
@@ -2555,7 +2555,7 @@ target: "4.bottom"
2555 } 2555 }
2556 } 2556 }
2557 part { name: "terminology.voldrag"; type: IMAGE; 2557 part { name: "terminology.voldrag"; type: IMAGE;
2558 mouse_events: 1; 2558 mouse_events: 0;
2559 repeat_events: 1; 2559 repeat_events: 1;
2560 clip_to: "media_clip"; 2560 clip_to: "media_clip";
2561 dragable { 2561 dragable {
@@ -2629,6 +2629,74 @@ target: "4.bottom"
2629 action: STATE_SET "default" 0.0; 2629 action: STATE_SET "default" 0.0;
2630 target: "terminology.voldrag"; 2630 target: "terminology.voldrag";
2631 } 2631 }
2632 program { name: "media_pos_drag_start";
2633 signal: "mouse,down,1"; source: "posline";
2634 filter: "terminology.posdrag" "default";
2635 script {
2636 new x, y, w, h, m_x, m_y;
2637 new Float:pos;
2638
2639 get_geometry(PART:"posline", x, y, w, h);
2640 get_mouse(m_x, m_y);
2641 pos = m_x - x;
2642 pos = pos / w;
2643 set_drag(PART:"terminology.posdrag", pos, 0.0);
2644 emit("pos,drag,start", "");
2645
2646 }
2647 }
2648 program { name: "media_pos_drag_stop";
2649 signal: "mouse,up,1"; source: "posline";
2650 action: SIGNAL_EMIT "pos,drag,stop" "";
2651 }
2652 program { name: "media_pos_drag";
2653 signal: "mouse,move"; source: "posline";
2654 script {
2655 new x, y, w, h, m_x, m_y;
2656 new Float:pos;
2657
2658 if (!get_mouse_buttons()) return;
2659
2660 get_geometry(PART:"posline", x, y, w, h);
2661 get_mouse(m_x, m_y);
2662 pos = m_x - x;
2663 pos = pos / w;
2664 set_drag(PART:"terminology.posdrag", pos, 0.0);
2665 emit("pos,drag", "");
2666 }
2667 }
2668 program { name: "media_vol_drag_start";
2669 signal: "mouse,down,1"; source: "volline";
2670 filter: "terminology.voldrag" "default";
2671 script {
2672 new x, y, w, h, m_x, m_y;
2673 new Float:pos;
2674
2675 get_geometry(PART:"volline", x, y, w, h);
2676 get_mouse(m_x, m_y);
2677 pos = m_x - x;
2678 pos = pos / w;
2679 set_drag(PART:"terminology.voldrag", pos, 0.0);
2680 emit("vol,drag", "");
2681
2682 }
2683 }
2684 program { name: "media_vol_drag";
2685 signal: "mouse,move"; source: "volline";
2686 script {
2687 new x, y, w, h, m_x, m_y;
2688 new Float:pos;
2689
2690 if (!get_mouse_buttons()) return;
2691
2692 get_geometry(PART:"volline", x, y, w, h);
2693 get_mouse(m_x, m_y);
2694 pos = m_x - x;
2695 pos = pos / w;
2696 set_drag(PART:"terminology.voldrag", pos, 0.0);
2697 emit("vol,drag", "");
2698 }
2699 }
2632 } 2700 }
2633 } 2701 }
2634 2702
diff --git a/data/themes/nyanology/nyanology.edc b/data/themes/nyanology/nyanology.edc
index 1147999..ff6e8d6 100644
--- a/data/themes/nyanology/nyanology.edc
+++ b/data/themes/nyanology/nyanology.edc
@@ -2550,7 +2550,7 @@ target: "4.bottom"
2550 } 2550 }
2551 } 2551 }
2552 part { name: "posline"; 2552 part { name: "posline";
2553 mouse_events: 0; 2553 mouse_events: 1;
2554 repeat_events: 1; 2554 repeat_events: 1;
2555 clip_to: "media_clip"; 2555 clip_to: "media_clip";
2556 description { state: "default" 0.0; 2556 description { state: "default" 0.0;
@@ -2565,7 +2565,7 @@ target: "4.bottom"
2565 } 2565 }
2566 } 2566 }
2567 part { name: "terminology.posdrag"; 2567 part { name: "terminology.posdrag";
2568 mouse_events: 1; 2568 mouse_events: 0;
2569 repeat_events: 1; 2569 repeat_events: 1;
2570 clip_to: "media_clip"; 2570 clip_to: "media_clip";
2571 dragable { 2571 dragable {
@@ -2583,7 +2583,7 @@ target: "4.bottom"
2583 } 2583 }
2584 } 2584 }
2585 part { name: "volline"; 2585 part { name: "volline";
2586 mouse_events: 0; 2586 mouse_events: 1;
2587 repeat_events: 1; 2587 repeat_events: 1;
2588 clip_to: "media_clip"; 2588 clip_to: "media_clip";
2589 description { state: "default" 0.0; 2589 description { state: "default" 0.0;
@@ -2603,7 +2603,7 @@ target: "4.bottom"
2603 } 2603 }
2604 } 2604 }
2605 part { name: "terminology.voldrag"; type: IMAGE; 2605 part { name: "terminology.voldrag"; type: IMAGE;
2606 mouse_events: 1; 2606 mouse_events: 0;
2607 repeat_events: 1; 2607 repeat_events: 1;
2608 clip_to: "media_clip"; 2608 clip_to: "media_clip";
2609 dragable { 2609 dragable {
@@ -2677,6 +2677,74 @@ target: "4.bottom"
2677 action: STATE_SET "default" 0.0; 2677 action: STATE_SET "default" 0.0;
2678 target: "terminology.voldrag"; 2678 target: "terminology.voldrag";
2679 } 2679 }
2680 program { name: "media_pos_drag_start";
2681 signal: "mouse,down,1"; source: "posline";
2682 filter: "terminology.posdrag" "default";
2683 script {
2684 new x, y, w, h, m_x, m_y;
2685 new Float:pos;
2686
2687 get_geometry(PART:"posline", x, y, w, h);
2688 get_mouse(m_x, m_y);
2689 pos = m_x - x;
2690 pos = pos / w;
2691 set_drag(PART:"terminology.posdrag", pos, 0.0);
2692 emit("pos,drag,start", "");
2693
2694 }
2695 }
2696 program { name: "media_pos_drag_stop";
2697 signal: "mouse,up,1"; source: "posline";
2698 action: SIGNAL_EMIT "pos,drag,stop" "";
2699 }
2700 program { name: "media_pos_drag";
2701 signal: "mouse,move"; source: "posline";
2702 script {
2703 new x, y, w, h, m_x, m_y;
2704 new Float:pos;
2705
2706 if (!get_mouse_buttons()) return;
2707
2708 get_geometry(PART:"posline", x, y, w, h);
2709 get_mouse(m_x, m_y);
2710 pos = m_x - x;
2711 pos = pos / w;
2712 set_drag(PART:"terminology.posdrag", pos, 0.0);
2713 emit("pos,drag", "");
2714 }
2715 }
2716 program { name: "media_vol_drag_start";
2717 signal: "mouse,down,1"; source: "volline";
2718 filter: "terminology.voldrag" "default";
2719 script {
2720 new x, y, w, h, m_x, m_y;
2721 new Float:pos;
2722
2723 get_geometry(PART:"volline", x, y, w, h);
2724 get_mouse(m_x, m_y);
2725 pos = m_x - x;
2726 pos = pos / w;
2727 set_drag(PART:"terminology.voldrag", pos, 0.0);
2728 emit("vol,drag", "");
2729
2730 }
2731 }
2732 program { name: "media_vol_drag";
2733 signal: "mouse,move"; source: "volline";
2734 script {
2735 new x, y, w, h, m_x, m_y;
2736 new Float:pos;
2737
2738 if (!get_mouse_buttons()) return;
2739
2740 get_geometry(PART:"volline", x, y, w, h);
2741 get_mouse(m_x, m_y);
2742 pos = m_x - x;
2743 pos = pos / w;
2744 set_drag(PART:"terminology.voldrag", pos, 0.0);
2745 emit("vol,drag", "");
2746 }
2747 }
2680 } 2748 }
2681 } 2749 }
2682 2750