diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/editors/space_userpref | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/editors/space_userpref')
-rw-r--r-- | source/blender/editors/space_userpref/CMakeLists.txt | 20 | ||||
-rw-r--r-- | source/blender/editors/space_userpref/space_userpref.c | 267 | ||||
-rw-r--r-- | source/blender/editors/space_userpref/userpref_ops.c | 26 |
3 files changed, 155 insertions, 158 deletions
diff --git a/source/blender/editors/space_userpref/CMakeLists.txt b/source/blender/editors/space_userpref/CMakeLists.txt index d26766358ca..61fe2bff63f 100644 --- a/source/blender/editors/space_userpref/CMakeLists.txt +++ b/source/blender/editors/space_userpref/CMakeLists.txt @@ -16,13 +16,13 @@ # ***** END GPL LICENSE BLOCK ***** set(INC - ../include - ../../blenkernel - ../../blenlib - ../../makesdna - ../../makesrna - ../../windowmanager - ../../../../intern/guardedalloc + ../include + ../../blenkernel + ../../blenlib + ../../makesdna + ../../makesrna + ../../windowmanager + ../../../../intern/guardedalloc ) set(INC_SYS @@ -30,10 +30,10 @@ set(INC_SYS ) set(SRC - space_userpref.c - userpref_ops.c + space_userpref.c + userpref_ops.c - userpref_intern.h + userpref_intern.h ) set(LIB diff --git a/source/blender/editors/space_userpref/space_userpref.c b/source/blender/editors/space_userpref/space_userpref.c index 2857c5c8d81..2237e8b02bc 100644 --- a/source/blender/editors/space_userpref/space_userpref.c +++ b/source/blender/editors/space_userpref/space_userpref.c @@ -21,11 +21,9 @@ * \ingroup spuserpref */ - #include <string.h> #include <stdio.h> - #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" @@ -42,95 +40,88 @@ #include "UI_interface.h" - - /* ******************** default callbacks for userpref space ***************** */ static SpaceLink *userpref_new(const ScrArea *area, const Scene *UNUSED(scene)) { - ARegion *ar; - SpaceUserPref *spref; + ARegion *ar; + SpaceUserPref *spref; - spref = MEM_callocN(sizeof(SpaceUserPref), "inituserpref"); - spref->spacetype = SPACE_USERPREF; + spref = MEM_callocN(sizeof(SpaceUserPref), "inituserpref"); + spref->spacetype = SPACE_USERPREF; - /* header */ - ar = MEM_callocN(sizeof(ARegion), "header for userpref"); + /* header */ + ar = MEM_callocN(sizeof(ARegion), "header for userpref"); - BLI_addtail(&spref->regionbase, ar); - ar->regiontype = RGN_TYPE_HEADER; - /* Ignore user preference "USER_HEADER_BOTTOM" here (always show bottom for new types). */ - ar->alignment = RGN_ALIGN_BOTTOM; + BLI_addtail(&spref->regionbase, ar); + ar->regiontype = RGN_TYPE_HEADER; + /* Ignore user preference "USER_HEADER_BOTTOM" here (always show bottom for new types). */ + ar->alignment = RGN_ALIGN_BOTTOM; - /* navigation region */ - ar = MEM_callocN(sizeof(ARegion), "navigation region for userpref"); + /* navigation region */ + ar = MEM_callocN(sizeof(ARegion), "navigation region for userpref"); - BLI_addtail(&spref->regionbase, ar); - ar->regiontype = RGN_TYPE_NAV_BAR; - ar->alignment = RGN_ALIGN_LEFT; + BLI_addtail(&spref->regionbase, ar); + ar->regiontype = RGN_TYPE_NAV_BAR; + ar->alignment = RGN_ALIGN_LEFT; - /* Use smaller size when opened in area like properties editor. */ - if (area->winx && area->winx < 3.0f * UI_NAVIGATION_REGION_WIDTH * UI_DPI_FAC) { - ar->sizex = UI_NARROW_NAVIGATION_REGION_WIDTH; - } + /* Use smaller size when opened in area like properties editor. */ + if (area->winx && area->winx < 3.0f * UI_NAVIGATION_REGION_WIDTH * UI_DPI_FAC) { + ar->sizex = UI_NARROW_NAVIGATION_REGION_WIDTH; + } - /* execution region */ - ar = MEM_callocN(sizeof(ARegion), "execution region for userpref"); + /* execution region */ + ar = MEM_callocN(sizeof(ARegion), "execution region for userpref"); - BLI_addtail(&spref->regionbase, ar); - ar->regiontype = RGN_TYPE_EXECUTE; - ar->alignment = RGN_ALIGN_BOTTOM | RGN_SPLIT_PREV; - ar->flag |= RGN_FLAG_DYNAMIC_SIZE; + BLI_addtail(&spref->regionbase, ar); + ar->regiontype = RGN_TYPE_EXECUTE; + ar->alignment = RGN_ALIGN_BOTTOM | RGN_SPLIT_PREV; + ar->flag |= RGN_FLAG_DYNAMIC_SIZE; - /* main region */ - ar = MEM_callocN(sizeof(ARegion), "main region for userpref"); + /* main region */ + ar = MEM_callocN(sizeof(ARegion), "main region for userpref"); - BLI_addtail(&spref->regionbase, ar); - ar->regiontype = RGN_TYPE_WINDOW; + BLI_addtail(&spref->regionbase, ar); + ar->regiontype = RGN_TYPE_WINDOW; - return (SpaceLink *)spref; + return (SpaceLink *)spref; } /* not spacelink itself */ static void userpref_free(SpaceLink *UNUSED(sl)) { -// SpaceUserPref *spref = (SpaceUserPref *)sl; - + // SpaceUserPref *spref = (SpaceUserPref *)sl; } - /* spacetype; init callback */ static void userpref_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(sa)) { - } static SpaceLink *userpref_duplicate(SpaceLink *sl) { - SpaceUserPref *sprefn = MEM_dupallocN(sl); + SpaceUserPref *sprefn = MEM_dupallocN(sl); - /* clear or remove stuff from old */ + /* clear or remove stuff from old */ - return (SpaceLink *)sprefn; + return (SpaceLink *)sprefn; } - - /* add handlers, stuff you only do once or on area/region changes */ static void userpref_main_region_init(wmWindowManager *wm, ARegion *ar) { - /* do not use here, the properties changed in userprefs do a system-wide refresh, - * then scroller jumps back */ - /* ar->v2d.flag &= ~V2D_IS_INITIALISED; */ + /* do not use here, the properties changed in userprefs do a system-wide refresh, + * then scroller jumps back */ + /* ar->v2d.flag &= ~V2D_IS_INITIALISED; */ - ar->v2d.scroll = V2D_SCROLL_RIGHT | V2D_SCROLL_VERTICAL_HIDE; + ar->v2d.scroll = V2D_SCROLL_RIGHT | V2D_SCROLL_VERTICAL_HIDE; - ED_region_panels_init(wm, ar); + ED_region_panels_init(wm, ar); } static void userpref_main_region_draw(const bContext *C, ARegion *ar) { - ED_region_panels_ex(C, ar, NULL, U.userpref, true); + ED_region_panels_ex(C, ar, NULL, U.userpref, true); } static void userpref_operatortypes(void) @@ -139,133 +130,139 @@ static void userpref_operatortypes(void) static void userpref_keymap(struct wmKeyConfig *UNUSED(keyconf)) { - } /* add handlers, stuff you only do once or on area/region changes */ static void userpref_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar) { - ED_region_header_init(ar); + ED_region_header_init(ar); } static void userpref_header_region_draw(const bContext *C, ARegion *ar) { - ED_region_header(C, ar); + ED_region_header(C, ar); } /* add handlers, stuff you only do once or on area/region changes */ static void userpref_navigation_region_init(wmWindowManager *wm, ARegion *ar) { - ar->v2d.scroll = V2D_SCROLL_RIGHT | V2D_SCROLL_VERTICAL_HIDE; + ar->v2d.scroll = V2D_SCROLL_RIGHT | V2D_SCROLL_VERTICAL_HIDE; - ED_region_panels_init(wm, ar); + ED_region_panels_init(wm, ar); } static void userpref_navigation_region_draw(const bContext *C, ARegion *ar) { - ED_region_panels(C, ar); + ED_region_panels(C, ar); } /* add handlers, stuff you only do once or on area/region changes */ static void userpref_execute_region_init(wmWindowManager *wm, ARegion *ar) { - ED_region_panels_init(wm, ar); - ar->v2d.keepzoom |= V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y; + ED_region_panels_init(wm, ar); + ar->v2d.keepzoom |= V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y; } -static void userpref_main_region_listener( - wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *UNUSED(ar), - wmNotifier *UNUSED(wmn), const Scene *UNUSED(scene)) +static void userpref_main_region_listener(wmWindow *UNUSED(win), + ScrArea *UNUSED(sa), + ARegion *UNUSED(ar), + wmNotifier *UNUSED(wmn), + const Scene *UNUSED(scene)) { - /* context changes */ + /* context changes */ } -static void userpref_header_listener( - wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *UNUSED(ar), - wmNotifier *UNUSED(wmn), const Scene *UNUSED(scene)) +static void userpref_header_listener(wmWindow *UNUSED(win), + ScrArea *UNUSED(sa), + ARegion *UNUSED(ar), + wmNotifier *UNUSED(wmn), + const Scene *UNUSED(scene)) { - /* context changes */ + /* context changes */ #if 0 - switch (wmn->category) { - default: - break; - } + switch (wmn->category) { + default: + break; + } #endif } -static void userpref_navigation_region_listener( - wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *UNUSED(ar), - wmNotifier *UNUSED(wmn), const Scene *UNUSED(scene)) +static void userpref_navigation_region_listener(wmWindow *UNUSED(win), + ScrArea *UNUSED(sa), + ARegion *UNUSED(ar), + wmNotifier *UNUSED(wmn), + const Scene *UNUSED(scene)) { - /* context changes */ + /* context changes */ } -static void userpref_execute_region_listener( - wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *UNUSED(ar), - wmNotifier *UNUSED(wmn), const Scene *UNUSED(scene)) +static void userpref_execute_region_listener(wmWindow *UNUSED(win), + ScrArea *UNUSED(sa), + ARegion *UNUSED(ar), + wmNotifier *UNUSED(wmn), + const Scene *UNUSED(scene)) { - /* context changes */ + /* context changes */ } /* only called once, from space/spacetypes.c */ void ED_spacetype_userpref(void) { - SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype userpref"); - ARegionType *art; - - st->spaceid = SPACE_USERPREF; - strncpy(st->name, "Userpref", BKE_ST_MAXNAME); - - st->new = userpref_new; - st->free = userpref_free; - st->init = userpref_init; - st->duplicate = userpref_duplicate; - st->operatortypes = userpref_operatortypes; - st->keymap = userpref_keymap; - - /* regions: main window */ - art = MEM_callocN(sizeof(ARegionType), "spacetype userpref region"); - art->regionid = RGN_TYPE_WINDOW; - art->init = userpref_main_region_init; - art->draw = userpref_main_region_draw; - art->listener = userpref_main_region_listener; - art->keymapflag = ED_KEYMAP_UI; - - BLI_addhead(&st->regiontypes, art); - - /* regions: header */ - art = MEM_callocN(sizeof(ARegionType), "spacetype userpref region"); - art->regionid = RGN_TYPE_HEADER; - art->prefsizey = HEADERY; - art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_HEADER; - art->listener = userpref_header_listener; - art->init = userpref_header_region_init; - art->draw = userpref_header_region_draw; - - BLI_addhead(&st->regiontypes, art); - - /* regions: navigation window */ - art = MEM_callocN(sizeof(ARegionType), "spacetype userpref region"); - art->regionid = RGN_TYPE_NAV_BAR; - art->prefsizex = UI_NAVIGATION_REGION_WIDTH; - art->init = userpref_navigation_region_init; - art->draw = userpref_navigation_region_draw; - art->listener = userpref_navigation_region_listener; - art->keymapflag = ED_KEYMAP_UI; - - BLI_addhead(&st->regiontypes, art); - - /* regions: execution window */ - art = MEM_callocN(sizeof(ARegionType), "spacetype userpref region"); - art->regionid = RGN_TYPE_EXECUTE; - art->init = userpref_execute_region_init; - art->layout = ED_region_panels_layout; - art->draw = ED_region_panels_draw; - art->listener = userpref_execute_region_listener; - art->keymapflag = ED_KEYMAP_UI; - - BLI_addhead(&st->regiontypes, art); - - - BKE_spacetype_register(st); + SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype userpref"); + ARegionType *art; + + st->spaceid = SPACE_USERPREF; + strncpy(st->name, "Userpref", BKE_ST_MAXNAME); + + st->new = userpref_new; + st->free = userpref_free; + st->init = userpref_init; + st->duplicate = userpref_duplicate; + st->operatortypes = userpref_operatortypes; + st->keymap = userpref_keymap; + + /* regions: main window */ + art = MEM_callocN(sizeof(ARegionType), "spacetype userpref region"); + art->regionid = RGN_TYPE_WINDOW; + art->init = userpref_main_region_init; + art->draw = userpref_main_region_draw; + art->listener = userpref_main_region_listener; + art->keymapflag = ED_KEYMAP_UI; + + BLI_addhead(&st->regiontypes, art); + + /* regions: header */ + art = MEM_callocN(sizeof(ARegionType), "spacetype userpref region"); + art->regionid = RGN_TYPE_HEADER; + art->prefsizey = HEADERY; + art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_HEADER; + art->listener = userpref_header_listener; + art->init = userpref_header_region_init; + art->draw = userpref_header_region_draw; + + BLI_addhead(&st->regiontypes, art); + + /* regions: navigation window */ + art = MEM_callocN(sizeof(ARegionType), "spacetype userpref region"); + art->regionid = RGN_TYPE_NAV_BAR; + art->prefsizex = UI_NAVIGATION_REGION_WIDTH; + art->init = userpref_navigation_region_init; + art->draw = userpref_navigation_region_draw; + art->listener = userpref_navigation_region_listener; + art->keymapflag = ED_KEYMAP_UI; + + BLI_addhead(&st->regiontypes, art); + + /* regions: execution window */ + art = MEM_callocN(sizeof(ARegionType), "spacetype userpref region"); + art->regionid = RGN_TYPE_EXECUTE; + art->init = userpref_execute_region_init; + art->layout = ED_region_panels_layout; + art->draw = ED_region_panels_draw; + art->listener = userpref_execute_region_listener; + art->keymapflag = ED_KEYMAP_UI; + + BLI_addhead(&st->regiontypes, art); + + BKE_spacetype_register(st); } diff --git a/source/blender/editors/space_userpref/userpref_ops.c b/source/blender/editors/space_userpref/userpref_ops.c index f6aaf01747c..a67e6c27acb 100644 --- a/source/blender/editors/space_userpref/userpref_ops.c +++ b/source/blender/editors/space_userpref/userpref_ops.c @@ -45,30 +45,30 @@ static int reset_default_theme_exec(bContext *C, wmOperator *UNUSED(op)) { - UI_theme_init_default(); - UI_style_init_default(); - WM_event_add_notifier(C, NC_WINDOW, NULL); + UI_theme_init_default(); + UI_style_init_default(); + WM_event_add_notifier(C, NC_WINDOW, NULL); - return OPERATOR_FINISHED; + return OPERATOR_FINISHED; } static void PREFERENCES_OT_reset_default_theme(wmOperatorType *ot) { - /* identifiers */ - ot->name = "Reset to Default Theme"; - ot->idname = "PREFERENCES_OT_reset_default_theme"; - ot->description = "Reset to the default theme colors"; + /* identifiers */ + ot->name = "Reset to Default Theme"; + ot->idname = "PREFERENCES_OT_reset_default_theme"; + ot->description = "Reset to the default theme colors"; - /* callbacks */ - ot->exec = reset_default_theme_exec; + /* callbacks */ + ot->exec = reset_default_theme_exec; - /* flags */ - ot->flag = OPTYPE_REGISTER; + /* flags */ + ot->flag = OPTYPE_REGISTER; } /** \} */ void ED_operatortypes_userpref(void) { - WM_operatortype_append(PREFERENCES_OT_reset_default_theme); + WM_operatortype_append(PREFERENCES_OT_reset_default_theme); } |