Ton Roosendaal
ca320003f4
Patch prvovided by Guillermo, code was - afaik - from Rob Haarsma. This changes the toolbox (space menu) to have the first level aligned vertically. Works much easier that way, and since the items open either left or right, it doesn't flip order of the contents for it either. To allow people to test (and to compare) it's a user menu setting (in View & Controls, "Plain menus"). I've turned this on by default though, since I propose to not have it a user setting. User setting can be removed later. Fixed two bugs in patch: - if saved in user settings, first time usage of this toolbox opened in wrong location - Button for "plain menus" was writing a short in an int (causing this new menu not to work for big endian systems) As a bonus I've added the long wanted hotkey support for opening and closing sublevels of pulldowns with arrow keys! I didn't add the commenting out of correcting pulldown menu order, which is based on location of the originating button in the UI. This uncommenting didn't solve anything, since button definitions itself can be flipped too. (Example: the data brose menus in top bar need to be corrected). I can imagine the order flipping is sometimes annoying, but it still has reasons to be there; - the most important / most used items are always closest to the mouse. (like opening properties panel, or "Add new" for material. - it follows muscle memory and 'locus of attention' (mouse position). - menus are configured to open to the top for bottom headers, and to the bottom for top headers. We can expect the UI is configured consistantly for headers, so in general the menus will appear consistant as well. Where menu flipping fails is especially for alphabetic listings, like in the menu button of fileselect. However, that one should be configured to open by default to the bottom, so ordering is consistant as well. If people like to check this themselves; uncomment the lines in the top of the function uiBlockFlipOrder() in src/interface.c
135 lines
3.6 KiB
C++
135 lines
3.6 KiB
C++
/* toolbox (SPACEKEY) related
|
|
* $Id$
|
|
*
|
|
* ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version. The Blender
|
|
* Foundation also sells licenses for use in proprietary software under
|
|
* the Blender License. See http://www.blender.org/BL/ for information
|
|
* about this.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
|
|
* All rights reserved.
|
|
*
|
|
* The Original Code is: all of this file.
|
|
*
|
|
* Contributor(s): none yet.
|
|
*
|
|
* ***** END GPL/BL DUAL LICENSE BLOCK *****
|
|
*/
|
|
|
|
#ifndef BIF_TOOLBOX_H
|
|
#define BIF_TOOLBOX_H
|
|
|
|
|
|
/* TBOXX: width in pixels */
|
|
#define TBOXXL 80
|
|
#define TBOXXR 200
|
|
#define TBOXX (TBOXXL+TBOXXR)
|
|
/* TBOXEL: amount of element vertically */
|
|
#define TBOXEL 14
|
|
/* TBOXH: height of 1 element */
|
|
#define TBOXH 20
|
|
#define TBOXY TBOXH*TBOXEL
|
|
|
|
#define TBOXBLACK 1
|
|
#define TBOXDGREY 2
|
|
#define TBOXWHITE 3
|
|
#define TBOXGREY 4
|
|
#define TBOXLGREY 5
|
|
|
|
/* toolbox menu code defines
|
|
-> SPACE->(MAIN_ENTRY) */
|
|
#ifdef MAART
|
|
enum {
|
|
TBOX_MAIN_FILE,
|
|
TBOX_MAIN_ADD,
|
|
TBOX_MAIN_EDIT,
|
|
TBOX_MAIN_OBJECT1,
|
|
TBOX_MAIN_OBJECT2,
|
|
TBOX_MAIN_MESH,
|
|
TBOX_MAIN_CURVE,
|
|
TBOX_MAIN_KEY,
|
|
TBOX_MAIN_RENDER,
|
|
TBOX_MAIN_VIEW,
|
|
TBOX_MAIN_SEQ,
|
|
TBOX_MAIN_PYTOOL = 13
|
|
};
|
|
|
|
#else
|
|
enum {
|
|
TBOX_MAIN_ADD,
|
|
TBOX_MAIN_FILE,
|
|
TBOX_MAIN_EDIT,
|
|
TBOX_MAIN_OBJECT1,
|
|
TBOX_MAIN_OBJECT2,
|
|
TBOX_MAIN_MESH,
|
|
TBOX_MAIN_CURVE,
|
|
TBOX_MAIN_KEY,
|
|
TBOX_MAIN_RENDER,
|
|
TBOX_MAIN_VIEW,
|
|
TBOX_MAIN_SEQ,
|
|
TBOX_MAIN_PYTOOL = 13
|
|
};
|
|
#endif
|
|
|
|
/* protos */
|
|
|
|
/* toolbox.c */
|
|
void ColorFunc (int i);
|
|
void mygetcursor (short int *index);
|
|
void tbox_setinfo (int x, int y);
|
|
void bgnpupdraw (int startx, int starty, int endx, int endy);
|
|
void endpupdraw (void);
|
|
void asciitoraw (int ch, short unsigned int *event, short unsigned int *qual);
|
|
void tbox_execute (void);
|
|
void tbox_getmouse (short int *mval);
|
|
void tbox_setmain (int val);
|
|
void bgntoolbox (void);
|
|
void endtoolbox (void);
|
|
void tbox_embossbox (short int x1, short int y1, short int x2, short int y2, short int type);
|
|
void tbox_drawelem_body (int x, int y, int type);
|
|
void tbox_drawelem_text (int x, int y, int type);
|
|
void tbox_drawelem (int x, int y, int type);
|
|
void tbox_getactive (int *x, int *y);
|
|
void drawtoolbox (void);
|
|
void toolbox (void);
|
|
|
|
void toolbox_n(void);
|
|
void toolbox_n_add(void);
|
|
void reset_toolbox(void);
|
|
|
|
void notice (char *str, ...);
|
|
void error (char *fmt, ...);
|
|
|
|
int saveover (char *filename);
|
|
int okee (char *fmt, ...);
|
|
|
|
short button (short *var, short min, short max, char *str);
|
|
short fbutton (float *var, float min, float max, float a1, float a2, char *str);
|
|
short sbutton (char *var, float min, float max, char *str); /* __NLA */
|
|
int movetolayer_buts (unsigned int *lay);
|
|
void draw_numbuts_tip (char *str, int x1, int y1, int x2, int y2);
|
|
int do_clever_numbuts (char *name, int tot, int winevent);
|
|
void clever_numbuts_buts(void);
|
|
void add_numbut (int nr, int type, char *str, float min, float max, void *poin, char *tip);
|
|
void clever_numbuts (void);
|
|
void replace_names_but (void);
|
|
|
|
void BIF_screendump(int fscreen);
|
|
void write_screendump(char *name);
|
|
|
|
#endif
|