diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-15 07:13:38 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-15 07:13:38 +0300 |
commit | f08032e8f967e5c5893116fc24c82a18da7bdf79 (patch) | |
tree | 2613d1df53164faebf39e5b54b7c8c968d0e255c /source/blender/windowmanager | |
parent | ad50055610298cff793cdde1c01e1bc126398395 (diff) |
UI: various changes
* View2D to region now returns ints instead of shorts.
* Use "Numpad" instead of "Pad" in automatic keymap menu info.
* Menus can now use buttons other than BUTM and SEPR, in
particular TOG and ROW are now supported instead of flipping
bits manually.
* Added a simpler uiDefMenu* api for making menus now, and it
only supports Operator and RNA buttons at the moment, will be
used in next commit. Not sure how this will evolve .. makes
menu code look cleaner anyways.
* Ensure that interface code doesn't crash when getting unknown
Operators and RNA properties, and display their buttons grayed
out in that case.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/WM_api.h | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 34 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 2 |
3 files changed, 19 insertions, 19 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index c4cd6d655a3..a7b90a7fccd 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -77,7 +77,7 @@ ListBase *WM_keymap_listbase (struct wmWindowManager *wm, const char *nameid, int spaceid, int regionid); char *WM_key_event_string(short type); -char *WM_key_event_operator_string(struct bContext *C, char *opname, int opcontext, char *str, int len); +char *WM_key_event_operator_string(const struct bContext *C, const char *opname, int opcontext, char *str, int len); /* handlers */ diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index 3a05a319e8a..864146a8576 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -373,54 +373,54 @@ char *WM_key_event_string(short type) break; case PAD2: - return "Pad2"; + return "Numpad 2"; break; case PAD4: - return "Pad4"; + return "Numpad 4"; break; case PAD6: - return "Pad6"; + return "Numpad 6"; break; case PAD8: - return "Pad8"; + return "Numpad 8"; break; case PAD1: - return "Pad1"; + return "Numpad 1"; break; case PAD3: - return "Pad3"; + return "Numpad 3"; break; case PAD5: - return "Pad5"; + return "Numpad 5"; break; case PAD7: - return "Pad7"; + return "Numpad 7"; break; case PAD9: - return "Pad9"; + return "Numpad 9"; break; case PADPERIOD: - return "Padperiod"; + return "Numpad ."; break; case PADSLASHKEY: - return "Padslash"; + return "Numpad /"; break; case PADASTERKEY: - return "Padaster"; + return "Numpad *"; break; case PAD0: - return "Pad0"; + return "Numpad 0"; break; case PADMINUS: - return "Padminus"; + return "Numpad -"; break; case PADENTER: - return "Padenter"; + return "Numpad Enter"; break; case PADPLUSKEY: - return "Padplus"; + return "Numpad +"; break; case F1KEY: @@ -507,7 +507,7 @@ static char *wm_keymap_item_to_string(wmKeymapItem *kmi, char *str, int len) return str; } -char *WM_key_event_operator_string(bContext *C, char *opname, int opcontext, char *str, int len) +char *WM_key_event_operator_string(const bContext *C, const char *opname, int opcontext, char *str, int len) { wmEventHandler *handler; wmKeymapItem *kmi; diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index a2eefad05a5..627c0e7a1fc 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -174,7 +174,7 @@ void WM_operator_properties_create(PointerRNA *ptr, const char *opstring) if(ot) RNA_pointer_create(NULL, ot->srna, NULL, ptr); else - memset(ptr, 0, sizeof(*ptr)); + RNA_pointer_create(NULL, &RNA_OperatorProperties, NULL, ptr); } void WM_operator_properties_free(PointerRNA *ptr) |