AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

range: continue porting to GtkGadgets

Browse Source 
This commit rewrites a lot of the GtkRange internals to make full use
of the gadget structure.
This commit is contained in:
Cosimo Cecchi 2016-01-19 07:22:33 -02:00
parent e9fe46ea5f
commit 413b9d5b3c
4 changed files with 594 additions and 777 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1271
gtk/gtkrange.c
View File

File diff suppressed because it is too large Load Diff

4
gtk/theme/Adwaita/_common.scss
View File

@ -2616,6 +2616,8 @@ scale {
$_scale_slider_bg_pos: bottom;
@if $dir_infix == 'horz' {
min-height: 25px;
min-width: 20px;
@if $marks_infix == 'scale-has-marks-above' {
$_scale_slider_bg_pos: top;
margin-top: 1px;
@ -2623,6 +2625,8 @@ scale {
}
@else {
min-height: 20px;
min-width: 25px;
@if $marks_infix == 'scale-has-marks-above' { $_scale_slider_bg_pos: left bottom; }
@else { $_scale_slider_bg_pos: right bottom; }
}

48
gtk/theme/Adwaita/gtk-contained-dark.css
View File

@ -2769,6 +2769,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-dark.png"), url("assets/slider-horz-scale-has-marks-above-dark@2.png"));
min-height: 25px;
min-width: 20px;
margin-top: 1px;
background-position: top;
background-repeat: no-repeat;
@ -2778,6 +2780,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover-dark.png"), url("assets/slider-horz-scale-has-marks-above-hover-dark@2.png"));
min-height: 25px;
min-width: 20px;
margin-top: 1px;
background-position: top;
background-repeat: no-repeat;
@ -2787,6 +2791,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active-dark.png"), url("assets/slider-horz-scale-has-marks-above-active-dark@2.png"));
min-height: 25px;
min-width: 20px;
margin-top: 1px;
background-position: top;
background-repeat: no-repeat;
@ -2796,6 +2802,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png"));
min-height: 25px;
min-width: 20px;
margin-top: 1px;
background-position: top;
background-repeat: no-repeat;
@ -2805,6 +2813,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png"));
min-height: 25px;
min-width: 20px;
margin-top: 1px;
background-position: top;
background-repeat: no-repeat;
@ -2814,6 +2824,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png"));
min-height: 25px;
min-width: 20px;
margin-top: 1px;
background-position: top;
background-repeat: no-repeat;
@ -2823,6 +2835,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-dark.png"), url("assets/slider-horz-scale-has-marks-below-dark@2.png"));
min-height: 25px;
min-width: 20px;
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2831,6 +2845,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover-dark.png"), url("assets/slider-horz-scale-has-marks-below-hover-dark@2.png"));
min-height: 25px;
min-width: 20px;
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2839,6 +2855,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active-dark.png"), url("assets/slider-horz-scale-has-marks-below-active-dark@2.png"));
min-height: 25px;
min-width: 20px;
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2847,6 +2865,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png"));
min-height: 25px;
min-width: 20px;
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2855,6 +2875,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png"));
min-height: 25px;
min-width: 20px;
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2863,6 +2885,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png"));
min-height: 25px;
min-width: 20px;
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2871,6 +2895,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-dark.png"), url("assets/slider-vert-scale-has-marks-above-dark@2.png"));
min-height: 20px;
min-width: 25px;
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2879,6 +2905,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover-dark.png"), url("assets/slider-vert-scale-has-marks-above-hover-dark@2.png"));
min-height: 20px;
min-width: 25px;
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2887,6 +2915,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active-dark.png"), url("assets/slider-vert-scale-has-marks-above-active-dark@2.png"));
min-height: 20px;
min-width: 25px;
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2895,6 +2925,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png"));
min-height: 20px;
min-width: 25px;
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2903,6 +2935,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png"));
min-height: 20px;
min-width: 25px;
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2911,6 +2945,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png"));
min-height: 20px;
min-width: 25px;
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2919,6 +2955,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-dark.png"), url("assets/slider-vert-scale-has-marks-below-dark@2.png"));
min-height: 20px;
min-width: 25px;
background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2927,6 +2965,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover-dark.png"), url("assets/slider-vert-scale-has-marks-below-hover-dark@2.png"));
min-height: 20px;
min-width: 25px;
background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2935,6 +2975,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active-dark.png"), url("assets/slider-vert-scale-has-marks-below-active-dark@2.png"));
min-height: 20px;
min-width: 25px;
background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2943,6 +2985,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png"));
min-height: 20px;
min-width: 25px;
background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2951,6 +2995,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png"));
min-height: 20px;
min-width: 25px;
background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2959,6 +3005,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png"));
min-height: 20px;
min-width: 25px;
background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }

48
gtk/theme/Adwaita/gtk-contained.css
View File

@ -2800,6 +2800,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above.png"), url("assets/slider-horz-scale-has-marks-above@2.png"));
min-height: 25px;
min-width: 20px;
margin-top: 1px;
background-position: top;
background-repeat: no-repeat;
@ -2809,6 +2811,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover.png"), url("assets/slider-horz-scale-has-marks-above-hover@2.png"));
min-height: 25px;
min-width: 20px;
margin-top: 1px;
background-position: top;
background-repeat: no-repeat;
@ -2818,6 +2822,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active.png"), url("assets/slider-horz-scale-has-marks-above-active@2.png"));
min-height: 25px;
min-width: 20px;
margin-top: 1px;
background-position: top;
background-repeat: no-repeat;
@ -2827,6 +2833,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-insensitive@2.png"));
min-height: 25px;
min-width: 20px;
margin-top: 1px;
background-position: top;
background-repeat: no-repeat;
@ -2836,6 +2844,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop.png"), url("assets/slider-horz-scale-has-marks-above-backdrop@2.png"));
min-height: 25px;
min-width: 20px;
margin-top: 1px;
background-position: top;
background-repeat: no-repeat;
@ -2845,6 +2855,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png"));
min-height: 25px;
min-width: 20px;
margin-top: 1px;
background-position: top;
background-repeat: no-repeat;
@ -2854,6 +2866,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below.png"), url("assets/slider-horz-scale-has-marks-below@2.png"));
min-height: 25px;
min-width: 20px;
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2862,6 +2876,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover.png"), url("assets/slider-horz-scale-has-marks-below-hover@2.png"));
min-height: 25px;
min-width: 20px;
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2870,6 +2886,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active.png"), url("assets/slider-horz-scale-has-marks-below-active@2.png"));
min-height: 25px;
min-width: 20px;
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2878,6 +2896,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-insensitive@2.png"));
min-height: 25px;
min-width: 20px;
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2886,6 +2906,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop.png"), url("assets/slider-horz-scale-has-marks-below-backdrop@2.png"));
min-height: 25px;
min-width: 20px;
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2894,6 +2916,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png"));
min-height: 25px;
min-width: 20px;
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2902,6 +2926,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above.png"), url("assets/slider-vert-scale-has-marks-above@2.png"));
min-height: 20px;
min-width: 25px;
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2910,6 +2936,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover.png"), url("assets/slider-vert-scale-has-marks-above-hover@2.png"));
min-height: 20px;
min-width: 25px;
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2918,6 +2946,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active.png"), url("assets/slider-vert-scale-has-marks-above-active@2.png"));
min-height: 20px;
min-width: 25px;
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2926,6 +2956,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-insensitive@2.png"));
min-height: 20px;
min-width: 25px;
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2934,6 +2966,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop.png"), url("assets/slider-vert-scale-has-marks-above-backdrop@2.png"));
min-height: 20px;
min-width: 25px;
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2942,6 +2976,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png"));
min-height: 20px;
min-width: 25px;
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2950,6 +2986,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below.png"), url("assets/slider-vert-scale-has-marks-below@2.png"));
min-height: 20px;
min-width: 25px;
background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2958,6 +2996,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover.png"), url("assets/slider-vert-scale-has-marks-below-hover@2.png"));
min-height: 20px;
min-width: 25px;
background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2966,6 +3006,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active.png"), url("assets/slider-vert-scale-has-marks-below-active@2.png"));
min-height: 20px;
min-width: 25px;
background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2974,6 +3016,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-insensitive@2.png"));
min-height: 20px;
min-width: 25px;
background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2982,6 +3026,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop.png"), url("assets/slider-vert-scale-has-marks-below-backdrop@2.png"));
min-height: 20px;
min-width: 25px;
background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }
@ -2990,6 +3036,8 @@ scale {
border-style: none;
border-radius: 0;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png"));
min-height: 20px;
min-width: 25px;
background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }