diff options
Diffstat (limited to 'source/blender/editors/interface')
8 files changed, 23 insertions, 24 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index a5abbb2b86f..42f4b4495c3 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -1299,10 +1299,10 @@ static bool ui_but_event_property_operator_string(const bContext *C, } } else { - //puts("other id"); + // puts("other id"); } - //printf("prop shortcut: '%s' (%s)\n", RNA_property_identifier(prop), data_path); + // printf("prop shortcut: '%s' (%s)\n", RNA_property_identifier(prop), data_path); } /* we have a datapath! */ @@ -1615,7 +1615,7 @@ void ui_fontscale(short *points, float aspect) /* for some reason scaling fonts goes too fast compared to widget size */ /* XXX not true anymore? (ton) */ - //aspect = sqrt(aspect); + // aspect = sqrt(aspect); pointsf /= aspect; if (aspect > 1.0f) { diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 608ef69c4cc..8f19f40d1c0 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -3797,7 +3797,7 @@ static void ui_block_open_begin(bContext *C, uiBut *but, uiHandleButtonData *dat #endif /* this makes adjacent blocks auto open from now on */ - //if (but->block->auto_open == 0) { + // if (but->block->auto_open == 0) { // but->block->auto_open = 1; //} } diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 935d89937e0..41001ff6d14 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -840,7 +840,7 @@ static void ui_item_enum_expand_exec(uiLayout *layout, /* Separate items, potentially with a label. */ if (next_item->identifier) { /* Item without identifier but with name: - * Add group label for the following items. */ + * Add group label for the following items. */ if (item->name) { if (!is_first) { uiItemS(block->curlayout); diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index ae28c09b7e2..87e58a4b3b5 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -701,11 +701,10 @@ void ui_draw_aligned_panel(uiStyle *style, const bool is_closed_x = (panel->flag & PNL_CLOSEDX) ? true : false; const bool is_closed_y = (panel->flag & PNL_CLOSEDY) ? true : false; const bool is_subpanel = (panel->type && panel->type->parent); - const bool show_drag = - (!is_subpanel && - /* FIXME(campbell): currently no background means floating panel which can't be dragged. - * This may be changed in future. */ - show_background); + const bool show_drag = (!is_subpanel && + /* FIXME(campbell): currently no background means floating panel which + * can't be dragged. This may be changed in future. */ + show_background); if (panel->paneltab) { return; @@ -1672,7 +1671,7 @@ static void ui_handle_panel_header( if (mx <= block->rect.xmax - 8 - PNL_ICON) { button = 2; } - //else if (mx <= block->rect.xmin + 10 + 2 * PNL_ICON + 2) { + // else if (mx <= block->rect.xmin + 10 + 2 * PNL_ICON + 2) { // button = 1; //} } @@ -2064,7 +2063,7 @@ void UI_panel_category_draw_all(ARegion *ar, const char *category_id_active) BLF_enable(fontid, BLF_ROTATION); BLF_rotation(fontid, M_PI_2); - //UI_fontstyle_set(&style->widget); + // UI_fontstyle_set(&style->widget); ui_fontscale(&fstyle_points, aspect / (U.pixelsize * 1.1f)); BLF_size(fontid, fstyle_points, U.dpi); @@ -2569,7 +2568,7 @@ static void panel_activate_state(const bContext *C, Panel *pa, uiHandlePanelStat * is very hard to control and use, and has no real benefit." - BillRey * Aligorith, 2009Sep */ - //test_add_new_tabs(ar); // also copies locations of tabs in dragged panel + // test_add_new_tabs(ar); // also copies locations of tabs in dragged panel check_panel_overlap(ar, NULL); /* clears */ } diff --git a/source/blender/editors/interface/interface_region_search.c b/source/blender/editors/interface/interface_region_search.c index 930f9e3fe1f..251bc86a3f5 100644 --- a/source/blender/editors/interface/interface_region_search.c +++ b/source/blender/editors/interface/interface_region_search.c @@ -598,7 +598,7 @@ ARegion *ui_searchbox_create_generic(bContext *C, ARegion *butregion, uiBut *but winx = WM_window_pixels_x(win); // winy = WM_window_pixels_y(win); /* UNUSED */ - //wm_window_get_size(win, &winx, &winy); + // wm_window_get_size(win, &winx, &winy); if (rect_i.xmax > winx) { /* super size */ diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c index 017b7dea352..4a9c7b689c1 100644 --- a/source/blender/editors/interface/interface_region_tooltip.c +++ b/source/blender/editors/interface/interface_region_tooltip.c @@ -1063,7 +1063,7 @@ static ARegion *ui_tooltip_create_with_data(bContext *C, field->geom.x_pos = x_pos; } - //fontw *= aspect; + // fontw *= aspect; BLF_disable(data->fstyle.uifont_id, font_flag); BLF_disable(blf_mono_font, font_flag); diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 52c1390a2fd..f656e917c44 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -798,7 +798,7 @@ static void template_ID(bContext *C, char name[UI_MAX_NAME_STR]; const bool user_alert = (id->us <= 0); - //text_idbutton(id, name); + // text_idbutton(id, name); name[0] = '\0'; but = uiDefButR(block, UI_BTYPE_TEXT, @@ -4997,7 +4997,7 @@ static void uilist_filter_items_default(struct uiList *ui_list, dyn_data->items_shown++; do_order = order_by_name; } - //printf("%s: '%s' matches '%s'\n", __func__, name, filter); + // printf("%s: '%s' matches '%s'\n", __func__, name, filter); } else if (filter_exclude) { dyn_data->items_shown++; @@ -5321,16 +5321,16 @@ void uiTemplateList(uiLayout *layout, dyn_data->items_len = dyn_data->items_shown = RNA_property_collection_length(dataptr, prop); } else { - //printf("%s: filtering...\n", __func__); + // printf("%s: filtering...\n", __func__); filter_items(ui_list, C, dataptr, propname); - //printf("%s: filtering done.\n", __func__); + // printf("%s: filtering done.\n", __func__); } items_shown = dyn_data->items_shown; if (items_shown >= 0) { bool activei_mapping_pending = true; items_ptr = MEM_mallocN(sizeof(_uilist_item) * items_shown, __func__); - //printf("%s: items shown: %d.\n", __func__, items_shown); + // printf("%s: items shown: %d.\n", __func__, items_shown); RNA_PROP_BEGIN (dataptr, itemptr, prop) { if (!dyn_data->items_filter_flags || ((dyn_data->items_filter_flags[i] & UILST_FLT_ITEM) ^ filter_exclude)) { @@ -5342,7 +5342,7 @@ void uiTemplateList(uiLayout *layout, else { ii = order_reverse ? items_shown - ++idx : idx++; } - //printf("%s: ii: %d\n", __func__, ii); + // printf("%s: ii: %d\n", __func__, ii); items_ptr[ii].item = itemptr; items_ptr[ii].org_idx = i; items_ptr[ii].flt_flag = dyn_data->items_filter_flags ? dyn_data->items_filter_flags[i] : diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 32ec7910b36..a9cd2f9cee1 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -2787,8 +2787,8 @@ static void widget_menu_back(uiWidgetColors *wcol, rcti *rect, int flag, int dir /* menu is 2nd level or deeper */ if (flag & UI_BLOCK_POPUP) { - //rect->ymin -= 4.0; - //rect->ymax += 4.0; + // rect->ymin -= 4.0; + // rect->ymax += 4.0; } else if (direction == UI_DIR_DOWN) { roundboxalign = (UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT); @@ -4686,7 +4686,7 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct } if (wt) { - //rcti disablerect = *rect; /* rect gets clipped smaller for text */ + // rcti disablerect = *rect; /* rect gets clipped smaller for text */ int roundboxalign, state, drawflag; bool disabled = false; |