[Bf-blender-cvs] [1f7a59c] pie-menus: UI changes:

[Antony Riakiotakis]

Commit: 1f7a59ce7bcb0f8aca3bec2b93839d6a08db0f0e
Author: Antony Riakiotakis
Date:   Sat May 31 00:43:13 2014 +0300
https://developer.blender.org/rB1f7a59ce7bcb0f8aca3bec2b93839d6a08db0f0e

UI changes:

* Central widget does not depend on width of menu text.
* Menu name hovers above the central widget.

===================================================================

M       source/blender/editors/interface/interface_intern.h
M       source/blender/editors/interface/interface_layout.c
M       source/blender/editors/interface/interface_regions.c
M       source/blender/editors/interface/interface_widgets.c

===================================================================

diff --git a/source/blender/editors/interface/interface_intern.h 
b/source/blender/editors/interface/interface_intern.h
index df56378..bc159f9 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -370,7 +370,6 @@ struct uiBlock {
                                  * used by color widgets to transform colors 
from/to scene linear
                                  */
        int num_pie_items; /* number of pie items, useful to determine 
collision based on how pie items are distributed */
-       float pie_center_width; /* width of the central text of the pie menu */
        float pie_dir[2];
        int event; /* initial event used to fire the pie menu, store here so we 
can query for release */
 };
diff --git a/source/blender/editors/interface/interface_layout.c 
b/source/blender/editors/interface/interface_layout.c
index 4e53015..0d3ea9b 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -2301,7 +2301,7 @@ static void ui_litem_layout_root_radial(uiLayout *litem)
 
                ui_item_size(item, &itemw, &itemh);
 
-               ui_item_position(item, x - itemw/2, y - itemh/2, itemw, itemh);
+               ui_item_position(item, x - itemw/2, y + 2.0 * UI_UNIT_Y, itemw, 
itemh);
        }
 }
 
diff --git a/source/blender/editors/interface/interface_regions.c 
b/source/blender/editors/interface/interface_regions.c
index 47216f7..8e9b6d5 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -2505,7 +2505,6 @@ struct uiPieMenu *uiPieMenuBegin(struct bContext *C, 
const char *title, int icon
                        /* hack, draw label with default transparent style */
                        but->dt = UI_EMBOSSP;
                }
-               pie->block_radial->pie_center_width = 
BLI_rctf_size_x(&but->rect)/2.0;
        }
 
        return pie;
diff --git a/source/blender/editors/interface/interface_widgets.c 
b/source/blender/editors/interface/interface_widgets.c
index 46f6841..636b1fc 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -3674,7 +3674,7 @@ void ui_draw_pie_center(uiBlock *block)
        float cx = BLI_rctf_cent_x(&block->rect);
        float cy = BLI_rctf_cent_y(&block->rect);
 
-       float pie_radius_internal = block->pie_center_width;
+       float pie_radius_internal = UI_UNIT_Y;
 
        glPushMatrix();
        glTranslatef(cx, cy, 0.0);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs