Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2004-03-25 16:30:20 +0300
committerTon Roosendaal <ton@blender.org>2004-03-25 16:30:20 +0300
commitd82ab2bfc35711d23dc1c260fc6b57cb124abc34 (patch)
treea582c417b37be3059510761180cfb116d85c837c /source
parent29baa5026ea90d2654d873c9a9e65a9e321fbb12 (diff)
- small patch to make sure buttons are fully used for strings (when it
doesnt fit), plus the 'user count' button now increases in size when amount is larger than 10. was report #1049
Diffstat (limited to 'source')
-rw-r--r--source/blender/src/headerbuttons.c2
-rw-r--r--source/blender/src/interface.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/src/headerbuttons.c b/source/blender/src/headerbuttons.c
index 69cba39f4ff..536b19783e3 100644
--- a/source/blender/src/headerbuttons.c
+++ b/source/blender/src/headerbuttons.c
@@ -439,7 +439,7 @@ int std_libbuttons(uiBlock *block, short xco, short yco,
uiSetButLock (pin && *pinpoin, "Can't make pinned data single-user");
sprintf(str1, "%d", id->us);
- if(id->us<100) {
+ if(id->us<10) {
uiDefBut(block, BUT, users, str1, xco,yco,XIC,YIC, 0, 0, 0, 0, 0, "Displays number of users of this data. Click to make a single-user copy.");
xco+= XIC;
diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c
index 28c220ca8a4..81808d8789f 100644
--- a/source/blender/src/interface.c
+++ b/source/blender/src/interface.c
@@ -3354,11 +3354,11 @@ void ui_check_but(uiBut *but)
ui_is_but_sel(but);
-
+ /* safety is 4 to enable small number buttons (like 'users') */
if(but->type==NUMSLI || but->type==HSVSLI)
- okwidth= -7 + (but->x2 - but->x1)/2.0;
+ okwidth= -4 + (but->x2 - but->x1)/2.0;
else
- okwidth= -7 + (but->x2 - but->x1);
+ okwidth= -4 + (but->x2 - but->x1);
/* name: */
switch( but->type ) {