[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53558] trunk/blender/source/blender: Fixes - post 2.65a
Ton Roosendaal
ton at blender.org
Fri Jan 4 15:51:06 CET 2013
Revision: 53558
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53558
Author: ton
Date: 2013-01-04 14:51:02 +0000 (Fri, 04 Jan 2013)
Log Message:
-----------
Fixes - post 2.65a
- Trackpad swipes now behave same as scrollwheel for listview scrolls
(disabling 2d view scroll when mouse over)
- Added back 2.4 debug print for glGetError()
Only useful for developers - to check what goes on when ogl messes up.
- Made more clear print for read factory default. It's not error :)
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/intern/wm_files.c
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2013-01-04 13:19:57 UTC (rev 53557)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2013-01-04 14:51:02 UTC (rev 53558)
@@ -6131,70 +6131,79 @@
int value, min, max;
int type = event->type, val = event->val;
- /* convert pan to scrollwheel */
- if (type == MOUSEPAN)
- ui_pan_to_scroll(event, &type, &val);
-
- if (but && (val == KM_PRESS)) {
+ if (but) {
uiList *ui_list = but->custom_data;
if (ui_list) {
+
+ /* convert pan to scrollwheel */
+ if (type == MOUSEPAN) {
+ ui_pan_to_scroll(event, &type, &val);
+
+ /* if type still is mousepan, we call it handled, since delta-y accumulate */
+ /* also see wm_event_system.c do_wheel_ui hack */
+ if (type == MOUSEPAN)
+ retval = WM_UI_HANDLER_BREAK;
+ }
+
+ if (val == KM_PRESS) {
+
+ if (ELEM(type, UPARROWKEY, DOWNARROWKEY) ||
+ ((ELEM(type, WHEELUPMOUSE, WHEELDOWNMOUSE) && event->alt)))
+ {
+ /* activate up/down the list */
+ value = RNA_property_int_get(&but->rnapoin, but->rnaprop);
- if (ELEM(type, UPARROWKEY, DOWNARROWKEY) ||
- ((ELEM(type, WHEELUPMOUSE, WHEELDOWNMOUSE) && event->alt)))
- {
- /* activate up/down the list */
- value = RNA_property_int_get(&but->rnapoin, but->rnaprop);
+ if (ELEM(type, UPARROWKEY, WHEELUPMOUSE))
+ value--;
+ else
+ value++;
- if (ELEM(type, UPARROWKEY, WHEELUPMOUSE))
- value--;
- else
- value++;
+ CLAMP(value, 0, ui_list->list_last_len - 1);
- CLAMP(value, 0, ui_list->list_last_len - 1);
+ if (value < ui_list->list_scroll)
+ ui_list->list_scroll = value;
+ else if (value >= ui_list->list_scroll + ui_list->list_size)
+ ui_list->list_scroll = value - ui_list->list_size + 1;
- if (value < ui_list->list_scroll)
- ui_list->list_scroll = value;
- else if (value >= ui_list->list_scroll + ui_list->list_size)
- ui_list->list_scroll = value - ui_list->list_size + 1;
+ RNA_property_int_range(&but->rnapoin, but->rnaprop, &min, &max);
+ value = CLAMPIS(value, min, max);
- RNA_property_int_range(&but->rnapoin, but->rnaprop, &min, &max);
- value = CLAMPIS(value, min, max);
+ RNA_property_int_set(&but->rnapoin, but->rnaprop, value);
+ RNA_property_update(C, &but->rnapoin, but->rnaprop);
+ ED_region_tag_redraw(ar);
- RNA_property_int_set(&but->rnapoin, but->rnaprop, value);
- RNA_property_update(C, &but->rnapoin, but->rnaprop);
- ED_region_tag_redraw(ar);
+ retval = WM_UI_HANDLER_BREAK;
+ }
+ else if (ELEM(type, WHEELUPMOUSE, WHEELDOWNMOUSE) && event->shift) {
+ /* silly replacement for proper grip */
+ if (ui_list->list_grip_size == 0)
+ ui_list->list_grip_size = ui_list->list_size;
- retval = WM_UI_HANDLER_BREAK;
- }
- else if (ELEM(type, WHEELUPMOUSE, WHEELDOWNMOUSE) && event->shift) {
- /* silly replacement for proper grip */
- if (ui_list->list_grip_size == 0)
- ui_list->list_grip_size = ui_list->list_size;
-
- if (type == WHEELUPMOUSE)
- ui_list->list_grip_size--;
- else
- ui_list->list_grip_size++;
-
- ui_list->list_grip_size = MAX2(ui_list->list_grip_size, 1);
-
- ED_region_tag_redraw(ar);
-
- retval = WM_UI_HANDLER_BREAK;
- }
- else if (ELEM(type, WHEELUPMOUSE, WHEELDOWNMOUSE)) {
- if (ui_list->list_last_len > ui_list->list_size) {
- /* list template will clamp */
if (type == WHEELUPMOUSE)
- ui_list->list_scroll--;
+ ui_list->list_grip_size--;
else
- ui_list->list_scroll++;
+ ui_list->list_grip_size++;
+ ui_list->list_grip_size = MAX2(ui_list->list_grip_size, 1);
+
ED_region_tag_redraw(ar);
retval = WM_UI_HANDLER_BREAK;
}
+ else if (ELEM(type, WHEELUPMOUSE, WHEELDOWNMOUSE)) {
+ if (ui_list->list_last_len > ui_list->list_size) {
+ /* list template will clamp */
+ if (type == WHEELUPMOUSE)
+ ui_list->list_scroll--;
+ else
+ ui_list->list_scroll++;
+
+ ED_region_tag_redraw(ar);
+
+ retval = WM_UI_HANDLER_BREAK;
+ }
+ }
}
}
}
Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2013-01-04 13:19:57 UTC (rev 53557)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2013-01-04 14:51:02 UTC (rev 53558)
@@ -66,6 +66,8 @@
#include "RNA_access.h"
+#include "BIF_gl.h"
+
#include "UI_interface.h"
#include "PIL_time.h"
@@ -338,7 +340,7 @@
ARegion *region = CTX_wm_region(C);
ARegion *menu = CTX_wm_menu(C);
static int do_wheel_ui = TRUE;
- int is_wheel = ELEM(event->type, WHEELUPMOUSE, WHEELDOWNMOUSE);
+ int is_wheel = ELEM3(event->type, WHEELUPMOUSE, WHEELDOWNMOUSE, MOUSEPAN);
int retval;
/* UI code doesn't handle return values - it just always returns break.
@@ -2180,6 +2182,12 @@
/* update key configuration after handling events */
WM_keyconfig_update(wm);
+
+ if(G.debug) {
+ GLenum error = glGetError();
+ if (error)
+ printf("GL error: %s\n", gluErrorString(error));
+ }
}
/* ********** filesector handling ************ */
Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c 2013-01-04 13:19:57 UTC (rev 53557)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c 2013-01-04 14:51:02 UTC (rev 53558)
@@ -531,7 +531,7 @@
}
if (U.themes.first == NULL) {
- printf("\nError: No valid "STRINGIFY (BLENDER_STARTUP_FILE)", fall back to built-in default.\n\n");
+ printf("\nNote: No (valid) "STRINGIFY (BLENDER_STARTUP_FILE)" found, fall back to built-in default.\n\n");
success = 0;
}
@@ -549,7 +549,7 @@
/* check new prefs only after startup.blend was finished */
if (!from_memory && BLI_exists(prefstr)) {
int done = BKE_read_file_userdef(prefstr, NULL);
- if (done) printf("read new prefs: %s\n", prefstr);
+ if (done) printf("Read new prefs: %s\n", prefstr);
}
/* prevent buggy files that had G_FILE_RELATIVE_REMAP written out by mistake. Screws up autosaves otherwise
More information about the Bf-blender-cvs
mailing list