Revision: 59762
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59762
Author: ack-err
Date: 2013-09-03 09:11:07 +0000 (Tue, 03 Sep 2013)
Log Message:
-----------
Commented out menubar text menus. It now displays only custom buttons.
Modified Paths:
--------------
branches/soc-2013-ui_replay/source/blender/editors/screen/area.c
branches/soc-2013-ui_replay/source/blender/editors/space_view3d/space_view3d.c
Modified: branches/soc-2013-ui_replay/source/blender/editors/screen/area.c
===================================================================
--- branches/soc-2013-ui_replay/source/blender/editors/screen/area.c
2013-09-03 06:46:17 UTC (rev 59761)
+++ branches/soc-2013-ui_replay/source/blender/editors/screen/area.c
2013-09-03 09:11:07 UTC (rev 59762)
@@ -956,17 +956,17 @@
/* prefsize, for header we stick to exception (prevent dpi rounding
error) */
prefsizex = UI_DPI_FAC * (ar->sizex > 1 ? ar->sizex + 0.5f :
ar->type->prefsizex);
- if (ar->regiontype == RGN_TYPE_HEADER) {
+ if (ar->regiontype == RGN_TYPE_HEADER || ar->regiontype ==
RGN_TYPE_MENU_BAR) {
prefsizey = ED_area_headersize();
}
- else if (ar->regiontype == RGN_TYPE_MENU_BAR) {
- /* quantize sizey to once or twice the headysize */
- int headersize = ED_area_headersize();
- if (ar->sizey > 0 && ar->sizey <= headersize)
- prefsizey = headersize;
- else if (ar->sizey > headersize)
- prefsizey = 2 * headersize;
- }
+// else if (ar->regiontype == RGN_TYPE_MENU_BAR) {
+// /* quantize sizey to once or twice the headysize */
+// int headersize = ED_area_headersize();
+// if (ar->sizey > 0 && ar->sizey <= headersize)
+// prefsizey = headersize;
+// else if (ar->sizey > headersize)
+// prefsizey = 2 * headersize;
+// }
else if (ar->regiontype == RGN_TYPE_UI && sa->spacetype == SPACE_FILE) {
prefsizey = UI_UNIT_Y * 2 + (UI_UNIT_Y / 2);
}
@@ -1867,11 +1867,11 @@
uiStyle *style = UI_GetStyleDraw();
uiBlock *block;
uiLayout *layout, *row;
- MenuBarType *mbt;
- MenuBar mb = {NULL};
+// MenuBarType *mbt;
+// MenuBar mb = {NULL};
int maxco, xco, yco;
- int headery = ED_area_headersize() * 2;
- const char *context = CTX_data_mode_string(C);
+ int headery = ED_area_headersize();
+// const char *context = CTX_data_mode_string(C);
OperatorListItem *oli;
/* clear */
@@ -1881,37 +1881,37 @@
/* set view2d view matrix for scrolling (without scrollers) */
UI_view2d_view_ortho(&ar->v2d);
- xco = maxco = 0.4f * UI_UNIT_X;
- yco = headery - floor(0.2f * UI_UNIT_Y);
-
- block = uiBeginBlock(C, ar, "menubar menus", UI_EMBOSS);
- layout = uiBlockLayout(block, UI_LAYOUT_HORIZONTAL, UI_LAYOUT_HEADER,
xco, yco, UI_UNIT_Y, 1, style);
+// xco = maxco = 0.4f * UI_UNIT_X;
+// yco = headery - floor(0.2f * UI_UNIT_Y);
+//
+// block = uiBeginBlock(C, ar, "menubar menus", UI_EMBOSS);
+// layout = uiBlockLayout(block, UI_LAYOUT_HORIZONTAL, UI_LAYOUT_HEADER,
xco, yco, UI_UNIT_Y, 1, style);
+//
+// /* add all menubar types to the top bar */
+// for (mbt = ar->type->menubartypes.first; mbt; mbt = mbt->next) {
+//
+// /* verify context */
+// if (context)
+// if (mbt->context[0] && strcmp(context, mbt->context) !=
0)
+// continue;
+//
+// if (mbt->draw) {
+// mb.type = mbt;
+// mb.layout = layout;
+// mbt->draw(C, &mb);
+// }
+// }
+//
+// /* draw top bar */
+// xco = uiLayoutGetWidth(layout);
+// if (xco > maxco) maxco = xco;
+// uiBlockLayoutResolve(block, &xco, &yco);
+// uiEndBlock(C, block);
+// uiDrawBlock(C, block);
- /* add all menubar types to the top bar */
- for (mbt = ar->type->menubartypes.first; mbt; mbt = mbt->next) {
-
- /* verify context */
- if (context)
- if (mbt->context[0] && strcmp(context, mbt->context) !=
0)
- continue;
-
- if (mbt->draw) {
- mb.type = mbt;
- mb.layout = layout;
- mbt->draw(C, &mb);
- }
- }
-
- /* draw top bar */
- xco = uiLayoutGetWidth(layout);
- if (xco > maxco) maxco = xco;
- uiBlockLayoutResolve(block, &xco, &yco);
- uiEndBlock(C, block);
- uiDrawBlock(C, block);
-
/* add all custom buttons to lower bar */
xco = maxco = 0.4f * UI_UNIT_X;
- yco = headery/2 - floor(0.2f * UI_UNIT_Y);
+ yco = headery - floor(0.2f * UI_UNIT_Y);
block = uiBeginBlock(C, ar, "menubar icons", UI_EMBOSS);
layout = uiBlockLayout(block, UI_LAYOUT_HORIZONTAL, UI_LAYOUT_HEADER,
xco, yco, UI_UNIT_Y, 1, style);
Modified:
branches/soc-2013-ui_replay/source/blender/editors/space_view3d/space_view3d.c
===================================================================
---
branches/soc-2013-ui_replay/source/blender/editors/space_view3d/space_view3d.c
2013-09-03 06:46:17 UTC (rev 59761)
+++
branches/soc-2013-ui_replay/source/blender/editors/space_view3d/space_view3d.c
2013-09-03 09:11:07 UTC (rev 59762)
@@ -1481,7 +1481,7 @@
/* regions: operators menu bar */
art = MEM_callocN(sizeof(ARegionType), "spacetype view3d operators menu
bar region");
art->regionid = RGN_TYPE_MENU_BAR;
- art->prefsizey = ED_area_headersize() * 2;
+ art->prefsizey = ED_area_headersize();
art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D;
art->listener = view3d_menubar_area_listener;
art->init = view3d_menubar_area_init;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
