From 48dc5b9a1149e7adf7ed35a1146e15b4a7d44adf Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Tue, 4 Jan 2005 14:07:59 +0000 Subject: [PATCH] smoother/nicer cursor now.. SVN revision: 12736 --- data/images/Makefile.am | 3 ++- data/images/pointer.png | Bin 583 -> 798 bytes data/images/pointer_mono.png | Bin 0 -> 230 bytes src/bin/e_pointer.c | 10 ++++++++-- 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 data/images/pointer_mono.png diff --git a/data/images/Makefile.am b/data/images/Makefile.am index d514a720e..ed991c226 100644 --- a/data/images/Makefile.am +++ b/data/images/Makefile.am @@ -5,6 +5,7 @@ button_in.png \ button_out.png \ e.png \ error_bg.png \ -pointer.png +pointer.png \ +pointer_mono.png EXTRA_DIST = $(files_DATA) diff --git a/data/images/pointer.png b/data/images/pointer.png index 3a31b8477a6ae2dd14108ce415bda571e0c12f7d..3d82101d78af5575f7b2d2bd279b2c4f37022e02 100644 GIT binary patch delta 739 zcmV<90v!Fv1fB+vDhciY?f~wJY48-0Ga-Kt1{`$YPZ$6I0;@?xK~y-)jg-Gn6hRcn zKfAX#dvK^R5Jh8Run>R6ghmC738Cc@8~*`X8ZBr{C@C!<6vU8Rrx;?SqM@+cMv5hY z;*yKzJctJp4kB>t?e2_)Z!c@mlS$sr?q=TSedoP51Mm=-1Fiu!kdfKqjH5U(FkpX_ zQlEjFfD2>=bSB7q&-2XE(vopqw*uS;&H*{V5jAbc^2Wx7X*3$9SS%XXb*sPw;3Ci| zYT81UH#av;5Cmp_f8Q)DEEuKKHt+=K0rKr2Heh8k8MM~ewoRc>U~X>is#0nZxGO4D zD!Hcs7-L%II1YtEf!W#FD@v)i|AT+D%4Li}Yu$p3jg2ugGm}8>{R?6PSeDgt)>@;r z#%-4uU|-Rxbe|U=nkZy@X-N$;k;(6wz!p+1lEoQmKC&1FwJ@ zuqTnb1QG(V4OmeWQLEMPJdf4YRe~U3XlRK3{{BwjhHTZ9?#xLZvOvZLs8*}Y&(AYH zJ|0d?OdJ%8Me_MPlarHHE|+^MQFTgsYh-|DzVF{&Sy?%X-Ai@T)tH*l_;0X5%2-{ChJasCJ=mBaTT|@(ZJ+ VI~^w$nUMeh002ovPDHLkV1li#2FC=DDhdAp{{a7>y{D6rGa-Kp7zxUCJn#Sj0n|xEK~y-)h15T86G0Tm z@y~2FPKZbl;Q}CPDkCm{XeeA#(a^vFI6)*TxB&72XhLP@6u>r!1JG;=P!I?yM2YR8 zdAk`|jx*BJTg}dV=l6T_Cn2Lka@q1yzOtoa&{hFi6p^n5|qx-u!)T&d#eEj)W=!5hRY8B#G@7O{8jUnfV>ldkfcxQhGrVs_3{dxg>2zu| z8o`Iior=dHd0s?$KT-t;2M6#TUpqyGihDT68U95+FJLm>;Q^lD5V>vJJef?o;yuSx zJPhD|+?Be*8@!EeImMS1D(1!Yo)x!rk)kL&aZtKr`w}l=@*zIrFMi?&eus9QS&9mG zknRfC(YG5h2=6BW`5kI!b;!Eth;h6(0?gL6&gZO`502at~@%rXsvI0B{OA1B3f^^M;n+i(`rTv2c0o7H|qYePI5C8xG M07*qoM6N<$f)7CQod5s; diff --git a/data/images/pointer_mono.png b/data/images/pointer_mono.png new file mode 100644 index 0000000000000000000000000000000000000000..2076856015d4e0657f0cc6f55c6a32b8a519d541 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm!3HEhFR0}KQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#DkBT8n$FSRPyK;H#hxyXAr`0KPPxs+pvd8p-uCbR z^t;nr%3h{z`n`o&P*W~glfgh`$*yRwgtX%V`wtqrynV>BXt^R+;CYG0j3+l*GoIaP z%$S7QR~$0mF> V;6MB6&Ksch44$rjF6*2UngDbNPzL}2 literal 0 HcmV?d00001 diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c index 0057f6fca..5ac3a835b 100644 --- a/src/bin/e_pointer.c +++ b/src/bin/e_pointer.c @@ -10,7 +10,10 @@ e_pointer_container_set(E_Container *con) int *pix; o = evas_object_image_add(con->bg_evas); - evas_object_image_file_set(o, e_path_find(path_images, "pointer.png"), NULL); + if (ecore_x_cursor_color_supported_get()) + evas_object_image_file_set(o, e_path_find(path_images, "pointer.png"), NULL); + else + evas_object_image_file_set(o, e_path_find(path_images, "pointer_mono.png"), NULL); evas_object_image_size_get(o, &w, &h); pix = evas_object_image_data_get(o, 0); cur = ecore_x_cursor_new(con->win, pix, w, h, 0, 0); @@ -34,7 +37,10 @@ e_pointer_ecore_evas_set(Ecore_Evas *ee) e = ecore_evas_get(ee); win = ecore_evas_software_x11_window_get(ee); o = evas_object_image_add(e); - evas_object_image_file_set(o, e_path_find(path_images, "pointer.png"), NULL); + if (ecore_x_cursor_color_supported_get()) + evas_object_image_file_set(o, e_path_find(path_images, "pointer.png"), NULL); + else + evas_object_image_file_set(o, e_path_find(path_images, "pointer_mono.png"), NULL); evas_object_image_size_get(o, &w, &h); pix = evas_object_image_data_get(o, 0); cur = ecore_x_cursor_new(win, pix, w, h, 0, 0);