[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33483] trunk/blender/source/blender/ editors/interface/interface_handlers.c: Bug fix #25042

[Ton Roosendaal]

Revision: 33483
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33483
Author:   ton
Date:     2010-12-05 13:14:02 +0100 (Sun, 05 Dec 2010)

Log Message:
-----------
Bug fix #25042

Emulate numpad option: failed to use zero key to reset color picker.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_handlers.c

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2010-12-05 10:38:45 UTC (rev 33482)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2010-12-05 12:14:02 UTC (rev 33483)
@@ -3062,7 +3062,8 @@
 			
 			return WM_UI_HANDLER_BREAK;
 		}
-		else if (event->type == ZEROKEY && event->val == KM_PRESS) {
+		/* XXX hardcoded keymap check.... */
+		else if (ELEM(event->type, ZEROKEY, PAD0) && event->val == KM_PRESS) {
 			if (but->a1==UI_GRAD_V_ALT){
 				int len;
 				
@@ -3183,7 +3184,8 @@
 			
 			return WM_UI_HANDLER_BREAK;
 		}
-		else if (event->type == ZEROKEY && event->val == KM_PRESS) {
+		/* XXX hardcoded keymap check.... */
+		else if (ELEM(event->type, ZEROKEY, PAD0) && event->val == KM_PRESS) {
 			int len;
 			
 			/* reset only saturation */
@@ -3628,7 +3630,8 @@
 			
 			return WM_UI_HANDLER_BREAK;
 		}
-		else if (event->type == ZEROKEY && event->val == KM_PRESS) {
+		/* XXX hardcoded keymap check.... */
+		else if (ELEM(event->type, ZEROKEY, PAD0) && event->val == KM_PRESS) {
 			Histogram *hist = (Histogram *)but->poin;
 			hist->ymax = 1.f;
 			
@@ -3710,7 +3713,8 @@
 
 			return WM_UI_HANDLER_BREAK;
 		}
-		else if (event->type == ZEROKEY && event->val == KM_PRESS) {
+		/* XXX hardcoded keymap check.... */
+		else if (ELEM(event->type, ZEROKEY, PAD0) && event->val == KM_PRESS) {
 			Scopes *scopes = (Scopes *)but->poin;
 			scopes->wavefrm_yfac = 1.f;
 
@@ -4336,7 +4340,8 @@
 			return WM_UI_HANDLER_BREAK;
 		}
 		/* reset to default */
-		else if(ELEM(event->type, ZEROKEY,PAD0) && event->val == KM_PRESS) {
+		/* XXX hardcoded keymap check.... */
+		else if(ELEM(event->type, ZEROKEY, PAD0) && event->val == KM_PRESS) {
 			if (!(ELEM3(but->type, HSVCIRCLE, HSVCUBE, HISTOGRAM)))
 				ui_set_but_default(C, but);
 		}