griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Button value reset:

Browse Source 
* shortcut key changed from numpad 0 to delete.
* fix missing undo push, now it calls the operator.

Patch by Damir Prebeg, thanks!
This commit is contained in:
Brecht Van Lommel
2011-05-31 09:56:38 +00:00
parent f51c9fa496
commit a8a36f31bd
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/interface/interface.c
View File

@@ -1670,15 +1670,12 @@ int ui_set_but_string(bContext *C, uiBut *but, const char *str)
void ui_set_but_default(bContext *C, uiBut *but, short all)
{
/* if there is a valid property that is editable... */
if (but->rnapoin.data && but->rnaprop && RNA_property_editable(&but->rnapoin, but->rnaprop)) {
int index = (all)? -1 : but->rnaindex;
if(RNA_property_reset(&but->rnapoin, but->rnaprop, index)) {
/* perform updates required for this property */
RNA_property_update(C, &but->rnapoin, but->rnaprop);
}
}
PointerRNA ptr;
WM_operator_properties_create(&ptr, "UI_OT_reset_default_button");
RNA_boolean_set(&ptr, "all", all);
WM_operator_name_call(C, "UI_OT_reset_default_button", WM_OP_EXEC_DEFAULT, &ptr);
WM_operator_properties_free(&ptr);
}
static double soft_range_round_up(double value, double max)

4
source/blender/editors/interface/interface_handlers.c
View File

@@ -4442,8 +4442,8 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, wmEvent *event)
}
/* reset to default */
/* XXX hardcoded keymap check.... */
else if(ELEM(event->type, ZEROKEY, PAD0) && event->val == KM_PRESS) {
/* ctrl-0 = for arrays, only the active one gets done (vs whole array for just 0) */
else if(ELEM(event->type, DELKEY, PADPERIOD) && event->val == KM_PRESS) {
/* ctrl+del - reset active button; del - reset a whole array*/
if (!(ELEM3(but->type, HSVCIRCLE, HSVCUBE, HISTOGRAM)))
ui_set_but_default(C, but, !event->ctrl);
}