Cleanup: wrapped function indentation

[blender.git] / source / blender / editors / interface / interface_layout.c

diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 7f50d7bf5b003a6cbfe2367d5b678ebe046b7d48..e8974b8571cca3b3aee865339a78d58af5913130 100644 (file)
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -217,7 +217,7 @@ static int ui_item_fit(int item, int pos, int all, int available, bool is_last,
 #define UI_ITEM_VARY_X  1
 #define UI_ITEM_VARY_Y  2
 
 #define UI_ITEM_VARY_X  1
 #define UI_ITEM_VARY_Y  2
 

-static bool ui_layout_vary_direction(uiLayout *layout)
+static int ui_layout_vary_direction(uiLayout *layout)

 {
        return ((ELEM(layout->root->type, UI_LAYOUT_HEADER, UI_LAYOUT_PIEMENU) ||
                (layout->alignment != UI_LAYOUT_ALIGN_EXPAND)) ?
 {
        return ((ELEM(layout->root->type, UI_LAYOUT_HEADER, UI_LAYOUT_PIEMENU) ||
                (layout->alignment != UI_LAYOUT_ALIGN_EXPAND)) ?


@@ -356,9 +356,10 @@ static void ui_layer_but_cb(bContext *C, void *arg_but, void *arg_index)
 }
 
 /* create buttons for an item with an RNA array */
 }
 
 /* create buttons for an item with an RNA array */

-static void ui_item_array(uiLayout *layout, uiBlock *block, const char *name, int icon,
-                          PointerRNA *ptr, PropertyRNA *prop, int len, int x, int y, int w, int UNUSED(h),
-                          bool expand, bool slider, bool toggle, bool icon_only)
+static void ui_item_array(
+        uiLayout *layout, uiBlock *block, const char *name, int icon,
+        PointerRNA *ptr, PropertyRNA *prop, int len, int x, int y, int w, int UNUSED(h),
+        bool expand, bool slider, bool toggle, bool icon_only)

 {
        uiStyle *style = layout->root->style;
        uiBut *but;
 {
        uiStyle *style = layout->root->style;
        uiBut *but;


@@ -545,8 +546,9 @@ static void ui_item_enum_expand_handle(bContext *C, void *arg1, void *arg2)
                RNA_property_enum_set(&but->rnapoin, but->rnaprop, current_value);
        }
 }
                RNA_property_enum_set(&but->rnapoin, but->rnaprop, current_value);
        }
 }

-static void ui_item_enum_expand(uiLayout *layout, uiBlock *block, PointerRNA *ptr, PropertyRNA *prop,
-                                const char *uiname, int h, bool icon_only)
+static void ui_item_enum_expand(
+        uiLayout *layout, uiBlock *block, PointerRNA *ptr, PropertyRNA *prop,
+        const char *uiname, int h, bool icon_only)

 {
        /* XXX The way this function currently handles uiname parameter is insane and inconsistent with general UI API:
         *     * uiname is the *enum property* label.
 {
        /* XXX The way this function currently handles uiname parameter is insane and inconsistent with general UI API:
         *     * uiname is the *enum property* label.


@@ -877,8 +879,9 @@ void uiItemEnumO(uiLayout *layout, const char *opname, const char *name, int ico
 
 }
 
 
 }
 

-void uiItemsFullEnumO(uiLayout *layout, const char *opname, const char *propname, IDProperty *properties,
-                      int context, int flag)
+void uiItemsFullEnumO(
+        uiLayout *layout, const char *opname, const char *propname, IDProperty *properties,
+        int context, int flag)

 {
        wmOperatorType *ot = WM_operatortype_find(opname, 0); /* print error next */
 
 {
        wmOperatorType *ot = WM_operatortype_find(opname, 0); /* print error next */
 


@@ -1129,8 +1132,9 @@ void uiItemO(uiLayout *layout, const char *name, int icon, const char *opname)
 
 /* RNA property items */
 
 
 /* RNA property items */
 

-static void ui_item_rna_size(uiLayout *layout, const char *name, int icon, PointerRNA *ptr, PropertyRNA *prop,
-                             int index, bool icon_only, int *r_w, int *r_h)
+static void ui_item_rna_size(
+        uiLayout *layout, const char *name, int icon, PointerRNA *ptr, PropertyRNA *prop,
+        int index, bool icon_only, int *r_w, int *r_h)

 {
        PropertyType type;
        PropertySubType subtype;
 {
        PropertyType type;
        PropertySubType subtype;


@@ -1573,11 +1577,14 @@ void ui_but_add_search(uiBut *but, PointerRNA *ptr, PropertyRNA *prop, PointerRN
 
        /* turn button into search button */
        if (searchprop) {
 
        /* turn button into search button */
        if (searchprop) {

-               but->type = RNA_property_is_unlink(prop) ? UI_BTYPE_SEARCH_MENU_UNLINK : UI_BTYPE_SEARCH_MENU;
+               but->type = UI_BTYPE_SEARCH_MENU;

                but->hardmax = MAX2(but->hardmax, 256.0f);
                but->rnasearchpoin = *searchptr;
                but->rnasearchprop = searchprop;
                but->drawflag |= UI_BUT_ICON_LEFT | UI_BUT_TEXT_LEFT;
                but->hardmax = MAX2(but->hardmax, 256.0f);
                but->rnasearchpoin = *searchptr;
                but->rnasearchprop = searchprop;
                but->drawflag |= UI_BUT_ICON_LEFT | UI_BUT_TEXT_LEFT;

+               if (RNA_property_is_unlink(prop)) {
+                       but->flag |= UI_BUT_SEARCH_UNLINK;
+               }

 
                if (RNA_property_type(prop) == PROP_ENUM) {
                        /* XXX, this will have a menu string,
 
                if (RNA_property_type(prop) == PROP_ENUM) {
                        /* XXX, this will have a menu string,


@@ -1677,8 +1684,9 @@ static void ui_item_menutype_func(bContext *C, uiLayout *layout, void *arg_mt)
        layout->root->block->flag ^= UI_BLOCK_IS_FLIP;
 }
 
        layout->root->block->flag ^= UI_BLOCK_IS_FLIP;
 }
 

-static uiBut *ui_item_menu(uiLayout *layout, const char *name, int icon, uiMenuCreateFunc func, void *arg, void *argN,
-                           const char *tip, bool force_menu)
+static uiBut *ui_item_menu(
+        uiLayout *layout, const char *name, int icon, uiMenuCreateFunc func, void *arg, void *argN,
+        const char *tip, bool force_menu)

 {
        uiBlock *block = layout->root->block;
        uiBut *but;
 {
        uiBlock *block = layout->root->block;
        uiBut *but;


@@ -2733,8 +2741,9 @@ void ui_layout_list_set_labels_active(uiLayout *layout)
        }
 }
 
        }
 }
 

-uiLayout *uiLayoutListBox(uiLayout *layout, uiList *ui_list, PointerRNA *ptr, PropertyRNA *prop, PointerRNA *actptr,
-                          PropertyRNA *actprop)
+uiLayout *uiLayoutListBox(
+        uiLayout *layout, uiList *ui_list, PointerRNA *ptr, PropertyRNA *prop, PointerRNA *actptr,
+        PropertyRNA *actprop)

 {
        uiLayoutItemBx *box = ui_layout_box(layout, UI_BTYPE_LISTBOX);
        uiBut *but = box->roundbox;
 {
        uiLayoutItemBx *box = ui_layout_box(layout, UI_BTYPE_LISTBOX);
        uiBut *but = box->roundbox;


@@ -3333,9 +3342,10 @@ static void ui_layout_operator_buts__reset_cb(bContext *UNUSED(C), void *op_pt,
 #endif
 
 /* this function does not initialize the layout, functions can be called on the layout before and after */
 #endif
 
 /* this function does not initialize the layout, functions can be called on the layout before and after */

-void uiLayoutOperatorButs(const bContext *C, uiLayout *layout, wmOperator *op,
-                          bool (*check_prop)(struct PointerRNA *, struct PropertyRNA *),
-                          const char label_align, const short flag)
+void uiLayoutOperatorButs(
+        const bContext *C, uiLayout *layout, wmOperator *op,
+        bool (*check_prop)(struct PointerRNA *, struct PropertyRNA *),
+        const char label_align, const short flag)

 {
        if (!op->properties) {
                IDPropertyTemplate val = {0};
 {
        if (!op->properties) {
                IDPropertyTemplate val = {0};