archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Bug fix #1893

Browse Source 
Option to switch left/right mouse didn't work for floating panels. It then
still selected stuff behind the button.
Was due to using wrong variable for events.
This commit is contained in:
Ton Roosendaal
2004-11-26 20:20:42 +00:00
parent a34432aa8c
commit 230784b824
7 changed files with 23 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/src/drawoops.c
View File

@@ -396,7 +396,6 @@ void drawoopsspace(ScrArea *sa, void *spacedata)
SpaceOops *soops= spacedata; SpaceOops *soops= spacedata;
Oops *oops; Oops *oops;
float col[3]; float col[3];
int ofsx, ofsy;
BIF_GetThemeColor3fv(TH_BACK, col); BIF_GetThemeColor3fv(TH_BACK, col);
glClearColor(col[0], col[1], col[2], 0.0); glClearColor(col[0], col[1], col[2], 0.0);
@@ -408,16 +407,6 @@ void drawoopsspace(ScrArea *sa, void *spacedata)
boundbox_oops(); boundbox_oops();
calc_scrollrcts(G.v2d, curarea->winx, curarea->winy); calc_scrollrcts(G.v2d, curarea->winx, curarea->winy);
if(curarea->winx>SCROLLB+10 && curarea->winy>SCROLLH+10) {
if(G.v2d->scroll) {
ofsx= curarea->winrct.xmin; /* because of mywin */
ofsy= curarea->winrct.ymin;
glViewport(ofsx+G.v2d->mask.xmin, ofsy+G.v2d->mask.ymin, ( ofsx+G.v2d->mask.xmax-1)-(ofsx+G.v2d->mask.xmin)+1, ( ofsy+G.v2d->mask.ymax-1)-( ofsy+G.v2d->mask.ymin)+1);
glScissor(ofsx+G.v2d->mask.xmin, ofsy+G.v2d->mask.ymin, ( ofsx+G.v2d->mask.xmax-1)-(ofsx+G.v2d->mask.xmin)+1, ( ofsy+G.v2d->mask.ymax-1)-( ofsy+G.v2d->mask.ymin)+1);
}
}
myortho2(G.v2d->cur.xmin, G.v2d->cur.xmax, G.v2d->cur.ymin, G.v2d->cur.ymax); myortho2(G.v2d->cur.xmin, G.v2d->cur.xmax, G.v2d->cur.ymin, G.v2d->cur.ymax);
oopscalex= .14*((float)curarea->winx)/(G.v2d->cur.xmax-G.v2d->cur.xmin); oopscalex= .14*((float)curarea->winx)/(G.v2d->cur.xmax-G.v2d->cur.xmin);
@@ -453,8 +442,10 @@ void drawoopsspace(ScrArea *sa, void *spacedata)
/* ortho at pixel level curarea */ /* ortho at pixel level curarea */
myortho2(-0.375, sa->winx-0.375, -0.375, sa->winy-0.375); myortho2(-0.375, sa->winx-0.375, -0.375, sa->winy-0.375);
if(sa->winx>SCROLLB+10 && sa->winy>SCROLLH+10) { if(soops->type==SO_OUTLINER) {
if(G.v2d->scroll) drawscroll(0); if(sa->winx>SCROLLB+10 && sa->winy>SCROLLH+10) {
if(G.v2d->scroll) drawscroll(0);
}
} }
draw_area_emboss(sa); draw_area_emboss(sa);

4
source/blender/src/editaction.c
View File

@@ -2248,10 +2248,10 @@ void winqreadactionspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
/* swap mouse buttons based on user preference */ /* swap mouse buttons based on user preference */
if (U.flag & USER_LMOUSESELECT) { if (U.flag & USER_LMOUSESELECT) {
if (evt->event == LEFTMOUSE) { if (event == LEFTMOUSE) {
event = RIGHTMOUSE; event = RIGHTMOUSE;
mousebut = L_MOUSE; mousebut = L_MOUSE;
} else if (evt->event == RIGHTMOUSE) { } else if (event == RIGHTMOUSE) {
event = LEFTMOUSE; event = LEFTMOUSE;
mousebut = R_MOUSE; mousebut = R_MOUSE;
} }

4
source/blender/src/editnla.c
View File

@@ -200,10 +200,10 @@ void winqreadnlaspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
/* swap mouse buttons based on user preference */ /* swap mouse buttons based on user preference */
if (U.flag & USER_LMOUSESELECT) { if (U.flag & USER_LMOUSESELECT) {
if (evt->event == LEFTMOUSE) { if (event == LEFTMOUSE) {
event = RIGHTMOUSE; event = RIGHTMOUSE;
mousebut = L_MOUSE; mousebut = L_MOUSE;
} else if (evt->event == RIGHTMOUSE) { } else if (event == RIGHTMOUSE) {
event = LEFTMOUSE; event = LEFTMOUSE;
mousebut = R_MOUSE; mousebut = R_MOUSE;
} }

4
source/blender/src/editsound.c
View File

@@ -119,10 +119,10 @@ void winqreadsoundspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
/* swap mouse buttons based on user preference */ /* swap mouse buttons based on user preference */
if (U.flag & USER_LMOUSESELECT) { if (U.flag & USER_LMOUSESELECT) {
if (evt->event == LEFTMOUSE) { if (event == LEFTMOUSE) {
event = RIGHTMOUSE; event = RIGHTMOUSE;
mousebut = L_MOUSE; mousebut = L_MOUSE;
} else if (evt->event == RIGHTMOUSE) { } else if (event == RIGHTMOUSE) {
event = LEFTMOUSE; event = LEFTMOUSE;
mousebut = R_MOUSE; mousebut = R_MOUSE;
} }

1
source/blender/src/header_oops.c
View File

@@ -86,6 +86,7 @@ void do_oops_buttons(short event)
switch(event) { switch(event) {
case B_OOPSHOME: case B_OOPSHOME:
init_v2d_oops(curarea, curarea->spacedata.first); // forces min/max to be reset
boundbox_oops(); boundbox_oops();
G.v2d->cur= G.v2d->tot; G.v2d->cur= G.v2d->tot;
dx= 0.15*(G.v2d->cur.xmax-G.v2d->cur.xmin); dx= 0.15*(G.v2d->cur.xmax-G.v2d->cur.xmin);

28
source/blender/src/space.c
View File

@@ -729,11 +729,8 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
/* swap mouse buttons based on user preference */ /* swap mouse buttons based on user preference */
if (U.flag & USER_LMOUSESELECT) { if (U.flag & USER_LMOUSESELECT) {
if (evt->event == LEFTMOUSE) { if (event==LEFTMOUSE) event = RIGHTMOUSE;
event = RIGHTMOUSE; else if (event==RIGHTMOUSE) event = LEFTMOUSE;
} else if (evt->event == RIGHTMOUSE) {
event = LEFTMOUSE;
}
} }
/* TEXTEDITING?? */ /* TEXTEDITING?? */
@@ -1762,10 +1759,10 @@ static void winqreadipospace(ScrArea *sa, void *spacedata, BWinEvent *evt)
/* swap mouse buttons based on user preference */ /* swap mouse buttons based on user preference */
if (U.flag & USER_LMOUSESELECT) { if (U.flag & USER_LMOUSESELECT) {
if (evt->event == LEFTMOUSE) { if (event == LEFTMOUSE) {
event = RIGHTMOUSE; event = RIGHTMOUSE;
mousebut = L_MOUSE; mousebut = L_MOUSE;
} else if (evt->event == RIGHTMOUSE) { } else if (event == RIGHTMOUSE) {
event = LEFTMOUSE; event = LEFTMOUSE;
mousebut = R_MOUSE; mousebut = R_MOUSE;
} }
@@ -3091,10 +3088,10 @@ static void winqreadseqspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
/* swap mouse buttons based on user preference */ /* swap mouse buttons based on user preference */
if (U.flag & USER_LMOUSESELECT) { if (U.flag & USER_LMOUSESELECT) {
if (evt->event == LEFTMOUSE) { if (event == LEFTMOUSE) {
event = RIGHTMOUSE; event = RIGHTMOUSE;
mousebut = L_MOUSE; mousebut = L_MOUSE;
} else if (evt->event == RIGHTMOUSE) { } else if (event == RIGHTMOUSE) {
event = LEFTMOUSE; event = LEFTMOUSE;
mousebut = R_MOUSE; mousebut = R_MOUSE;
} }
@@ -3541,10 +3538,10 @@ static void winqreadimagespace(ScrArea *sa, void *spacedata, BWinEvent *evt)
/* swap mouse buttons based on user preference */ /* swap mouse buttons based on user preference */
if (U.flag & USER_LMOUSESELECT) { if (U.flag & USER_LMOUSESELECT) {
if (evt->event == LEFTMOUSE) { if (event == LEFTMOUSE) {
event = RIGHTMOUSE; event = RIGHTMOUSE;
mousebut = R_MOUSE; mousebut = R_MOUSE;
} else if (evt->event == RIGHTMOUSE) { } else if (event == RIGHTMOUSE) {
event = LEFTMOUSE; event = LEFTMOUSE;
mousebut = L_MOUSE; mousebut = L_MOUSE;
} }
@@ -3841,13 +3838,10 @@ static void winqreadoopsspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
else { else {
/* swap mouse buttons based on user preference */ /* swap mouse buttons based on user preference */
if (U.flag & USER_LMOUSESELECT) { if (U.flag & USER_LMOUSESELECT) {
if (evt->event == LEFTMOUSE) { if (event==LEFTMOUSE) event = RIGHTMOUSE;
event = RIGHTMOUSE; else if (event==RIGHTMOUSE) event = LEFTMOUSE;
} else if (evt->event == RIGHTMOUSE) {
event = LEFTMOUSE;
}
} }
switch(event) { switch(event) {
case LEFTMOUSE: case LEFTMOUSE:
gesture(); gesture();

2
source/blender/src/toolbox.c
View File

@@ -1813,7 +1813,7 @@ static TBitem tb_mesh[]= {
{ 0, "Show/Hide Faces", 3, NULL}, { 0, "Show/Hide Faces", 3, NULL},
{ 0, "Show/Hide Normals", 4, NULL}, { 0, "Show/Hide Normals", 4, NULL},
{ 0, "SEPR", 0, NULL}, { 0, "SEPR", 0, NULL},
{ 0, "Subdivision Surface|Shift O", 5, NULL}, { 0, "Subdivision Surface", 5, NULL},
{ 0, "SubSurf Optimal", 6, NULL}, { 0, "SubSurf Optimal", 6, NULL},
{ 0, "SEPR", 0, NULL}, { 0, "SEPR", 0, NULL},
{ 0, "Show/Hide Vertices", 0, tb_obdata_hide}, { 0, "Show/Hide Vertices", 0, tb_obdata_hide},