diff options
| author | Ricki Myers <antihc3@gmail.com> | 2008-03-13 18:12:19 +0300 |
|---|---|---|
| committer | Ricki Myers <antihc3@gmail.com> | 2008-03-13 18:12:19 +0300 |
| commit | b3dab572328e1989276f6f4ef2dd1b6b1f82e86e (patch) | |
| tree | b78e382aa878be17885e4c346b04f09d97376304 | |
| parent | 4d3c9e88eda123c9f66825534035cbe98b7251cd (diff) | |
Patch #8488: UserPref to switch between pan/paste on MMB in text editor.
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 1 | ||||
| -rw-r--r-- | source/blender/src/drawtext.c | 11 | ||||
| -rw-r--r-- | source/blender/src/space.c | 5 |
3 files changed, 13 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 9d0c44d87c9..8f3d571f878 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -266,6 +266,7 @@ extern UserDef U; /* from usiblender.c !!!! */ // old flag for #define USER_KEYINSERTNEED (1 << 19) #define USER_ZOOM_TO_MOUSEPOS (1 << 20) #define USER_SHOW_FPS (1 << 21) +#define USER_MMB_PASTE (1 << 22) /* Auto-Keying mode */ /* AUTOKEY_ON is a bitflag */ diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c index a63e23b9886..22351479883 100644 --- a/source/blender/src/drawtext.c +++ b/source/blender/src/drawtext.c @@ -1546,13 +1546,16 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt) } } else if (event==MIDDLEMOUSE) { if (val) { - #if defined(_WIN32) || defined(__APPLE__) - do_textscroll(st, 1); - #else + if (U.uiflag & USER_MMB_PASTE) + { do_selection(st, G.qual&LR_SHIFTKEY); get_selection_buffer(text); do_draw= 1; - #endif + } + else + { + do_textscroll(st, 1); + } } } else if (event==RIGHTMOUSE) { if (val) { diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 7f26eed43c0..bc798a1493e 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -3694,6 +3694,11 @@ void drawinfospace(ScrArea *sa, void *spacedata) (xpos+edgsp+(3*mpref)+(4*midsp)),y3,mpref,buth, &(U.flag), 0, 0, 0, 0, "Emulates Middle Mouse with Alt+LeftMouse (doesnt work with Left Mouse Select option)"); + uiDefButBitI(block, TOG, USER_MMB_PASTE, B_DRAWINFO, "Paste on MMB", + (xpos+edgsp+(3*mpref)+(4*midsp)),y2,mpref,buth, + &(U.uiflag), 0, 0, 0, 0, + "In text window, paste with MMB instead of panning"); + uiBlockEndAlign(block); uiBlockBeginAlign(block); uiDefButBitI(block, TOG, USER_SHOW_ROTVIEWICON, B_DRAWINFO, "Mini Axis", |