diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-30 05:51:25 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-30 05:51:25 +0400 |
commit | a6ebffe182e3867b8a365499c7eb990fb277cbe7 (patch) | |
tree | 4bd67917e822a49eb7d939cafd1d6e57a3b6b4f5 /source/blender/editors/interface/interface_style.c | |
parent | 7b60ebf398757e40006b239d52562874b6b07784 (diff) |
style cleanup: interface
Diffstat (limited to 'source/blender/editors/interface/interface_style.c')
-rw-r--r-- | source/blender/editors/interface/interface_style.c | 188 |
1 files changed, 94 insertions, 94 deletions
diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c index 6a2038b18bc..91e3b99e23b 100644 --- a/source/blender/editors/interface/interface_style.c +++ b/source/blender/editors/interface/interface_style.c @@ -79,61 +79,61 @@ static uiStyle *ui_style_new(ListBase *styles, const char *name, short uifont_id) { - uiStyle *style= MEM_callocN(sizeof(uiStyle), "new style"); + uiStyle *style = MEM_callocN(sizeof(uiStyle), "new style"); BLI_addtail(styles, style); BLI_strncpy(style->name, name, MAX_STYLE_NAME); - style->panelzoom= 1.0; /* unused */ - - style->paneltitle.uifont_id= uifont_id; - style->paneltitle.points= 12; - style->paneltitle.kerning= 1; - style->paneltitle.shadow= 1; - style->paneltitle.shadx= 0; - style->paneltitle.shady= -1; - style->paneltitle.shadowalpha= 0.15f; - style->paneltitle.shadowcolor= 1.0f; - - style->grouplabel.uifont_id= uifont_id; - style->grouplabel.points= 12; - style->grouplabel.kerning= 1; - style->grouplabel.shadow= 3; - style->grouplabel.shadx= 0; - style->grouplabel.shady= -1; - style->grouplabel.shadowalpha= 0.25f; - - style->widgetlabel.uifont_id= uifont_id; - style->widgetlabel.points= 11; - style->widgetlabel.kerning= 1; - style->widgetlabel.shadow= 3; - style->widgetlabel.shadx= 0; - style->widgetlabel.shady= -1; - style->widgetlabel.shadowalpha= 0.15f; - style->widgetlabel.shadowcolor= 1.0f; - - style->widget.uifont_id= uifont_id; - style->widget.points= 11; - style->widget.kerning= 1; - style->widget.shadowalpha= 0.25f; - - style->columnspace= 8; - style->templatespace= 5; - style->boxspace= 5; - style->buttonspacex= 8; - style->buttonspacey= 2; - style->panelspace= 8; - style->panelouter= 4; + style->panelzoom = 1.0; /* unused */ + + style->paneltitle.uifont_id = uifont_id; + style->paneltitle.points = 12; + style->paneltitle.kerning = 1; + style->paneltitle.shadow = 1; + style->paneltitle.shadx = 0; + style->paneltitle.shady = -1; + style->paneltitle.shadowalpha = 0.15f; + style->paneltitle.shadowcolor = 1.0f; + + style->grouplabel.uifont_id = uifont_id; + style->grouplabel.points = 12; + style->grouplabel.kerning = 1; + style->grouplabel.shadow = 3; + style->grouplabel.shadx = 0; + style->grouplabel.shady = -1; + style->grouplabel.shadowalpha = 0.25f; + + style->widgetlabel.uifont_id = uifont_id; + style->widgetlabel.points = 11; + style->widgetlabel.kerning = 1; + style->widgetlabel.shadow = 3; + style->widgetlabel.shadx = 0; + style->widgetlabel.shady = -1; + style->widgetlabel.shadowalpha = 0.15f; + style->widgetlabel.shadowcolor = 1.0f; + + style->widget.uifont_id = uifont_id; + style->widget.points = 11; + style->widget.kerning = 1; + style->widget.shadowalpha = 0.25f; + + style->columnspace = 8; + style->templatespace = 5; + style->boxspace = 5; + style->buttonspacex = 8; + style->buttonspacey = 2; + style->panelspace = 8; + style->panelouter = 4; return style; } static uiFont *uifont_to_blfont(int id) { - uiFont *font= U.uifonts.first; + uiFont *font = U.uifonts.first; - for (; font; font= font->next) { - if (font->uifont_id==id) { + for (; font; font = font->next) { + if (font->uifont_id == id) { return font; } } @@ -144,31 +144,31 @@ static uiFont *uifont_to_blfont(int id) void uiStyleFontDrawExt(uiFontStyle *fs, rcti *rect, const char *str, - float *r_xofs, float *r_yofs) + float *r_xofs, float *r_yofs) { float height; - int xofs=0, yofs; + int xofs = 0, yofs; uiStyleFontSet(fs); - height= BLF_ascender(fs->uifont_id); - yofs= ceil( 0.5f*(rect->ymax - rect->ymin - height)); + height = BLF_ascender(fs->uifont_id); + yofs = ceil(0.5f * (rect->ymax - rect->ymin - height)); - if (fs->align==UI_STYLE_TEXT_CENTER) { - xofs= floor( 0.5f*(rect->xmax - rect->xmin - BLF_width(fs->uifont_id, str))); + if (fs->align == UI_STYLE_TEXT_CENTER) { + xofs = floor(0.5f * (rect->xmax - rect->xmin - BLF_width(fs->uifont_id, str))); /* don't center text if it chops off the start of the text, 2 gives some margin */ if (xofs < 2) { - xofs= 2; + xofs = 2; } } - else if (fs->align==UI_STYLE_TEXT_RIGHT) { - xofs= rect->xmax - rect->xmin - BLF_width(fs->uifont_id, str) - 1; + else if (fs->align == UI_STYLE_TEXT_RIGHT) { + xofs = rect->xmax - rect->xmin - BLF_width(fs->uifont_id, str) - 1; } /* clip is very strict, so we give it some space */ - BLF_clipping(fs->uifont_id, rect->xmin-1, rect->ymin-4, rect->xmax+1, rect->ymax+4); + BLF_clipping(fs->uifont_id, rect->xmin - 1, rect->ymin - 4, rect->xmax + 1, rect->ymax + 4); BLF_enable(fs->uifont_id, BLF_CLIPPING); - BLF_position(fs->uifont_id, rect->xmin+xofs, rect->ymin+yofs, 0.0f); + BLF_position(fs->uifont_id, rect->xmin + xofs, rect->ymin + yofs, 0.0f); if (fs->shadow) { BLF_enable(fs->uifont_id, BLF_SHADOW); @@ -186,15 +186,15 @@ void uiStyleFontDrawExt(uiFontStyle *fs, rcti *rect, const char *str, if (fs->kerning == 1) BLF_disable(fs->uifont_id, BLF_KERNING_DEFAULT); - *r_xofs= xofs; - *r_yofs= yofs; + *r_xofs = xofs; + *r_yofs = yofs; } void uiStyleFontDraw(uiFontStyle *fs, rcti *rect, const char *str) { float xofs, yofs; uiStyleFontDrawExt(fs, rect, str, - &xofs, &yofs); + &xofs, &yofs); } /* drawn same as above, but at 90 degree angle */ @@ -207,16 +207,16 @@ void uiStyleFontDrawRotated(uiFontStyle *fs, rcti *rect, const char *str) uiStyleFontSet(fs); - height= BLF_ascender(fs->uifont_id); + height = BLF_ascender(fs->uifont_id); /* becomes x-offset when rotated */ - xofs= ceil( 0.5f*(rect->ymax - rect->ymin - height)); + xofs = ceil(0.5f * (rect->ymax - rect->ymin - height)); /* ignore UI_STYLE, always aligned to top */ /* rotate counter-clockwise for now (assumes left-to-right language)*/ - xofs+= height; - yofs= BLF_width(fs->uifont_id, str) + 5; - angle= 90.0f; + xofs += height; + yofs = BLF_width(fs->uifont_id, str) + 5; + angle = 90.0f; /* translate rect to vertical */ txtrect.xmin = rect->xmin - (rect->ymax - rect->ymin); @@ -226,9 +226,9 @@ void uiStyleFontDrawRotated(uiFontStyle *fs, rcti *rect, const char *str) /* clip is very strict, so we give it some space */ /* clipping is done without rotation, so make rect big enough to contain both positions */ - BLF_clipping(fs->uifont_id, txtrect.xmin-1, txtrect.ymin-yofs-xofs-4, rect->xmax+1, rect->ymax+4); + BLF_clipping(fs->uifont_id, txtrect.xmin - 1, txtrect.ymin - yofs - xofs - 4, rect->xmax + 1, rect->ymax + 4); BLF_enable(fs->uifont_id, BLF_CLIPPING); - BLF_position(fs->uifont_id, txtrect.xmin+xofs, txtrect.ymax-yofs, 0.0f); + BLF_position(fs->uifont_id, txtrect.xmin + xofs, txtrect.ymax - yofs, 0.0f); BLF_enable(fs->uifont_id, BLF_ROTATION); BLF_rotation(fs->uifont_id, angle); @@ -253,7 +253,7 @@ void uiStyleFontDrawRotated(uiFontStyle *fs, rcti *rect, const char *str) /* ************** helpers ************************ */ /* XXX: read a style configure */ -uiStyle* UI_GetStyle(void) +uiStyle *UI_GetStyle(void) { uiStyle *style = NULL; /* offset is two struct uiStyle pointers */ @@ -264,17 +264,17 @@ uiStyle* UI_GetStyle(void) /* temporarily, does widget font */ int UI_GetStringWidth(const char *str) { - uiStyle *style= UI_GetStyle(); - uiFontStyle *fstyle= &style->widget; + uiStyle *style = UI_GetStyle(); + uiFontStyle *fstyle = &style->widget; int width; - if (fstyle->kerning==1) /* for BLF_width */ + if (fstyle->kerning == 1) /* for BLF_width */ BLF_enable(fstyle->uifont_id, BLF_KERNING_DEFAULT); uiStyleFontSet(fstyle); - width= BLF_width(fstyle->uifont_id, str); + width = BLF_width(fstyle->uifont_id, str); - if (fstyle->kerning==1) + if (fstyle->kerning == 1) BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT); return width; @@ -283,7 +283,7 @@ int UI_GetStringWidth(const char *str) /* temporarily, does widget font */ void UI_DrawString(float x, float y, const char *str) { - uiStyle *style= UI_GetStyle(); + uiStyle *style = UI_GetStyle(); if (style->widget.kerning == 1) BLF_enable(style->widget.uifont_id, BLF_KERNING_DEFAULT); @@ -302,39 +302,39 @@ void UI_DrawString(float x, float y, const char *str) /* reading without uifont will create one */ void uiStyleInit(void) { - uiFont *font= U.uifonts.first; - uiStyle *style= U.uistyles.first; + uiFont *font = U.uifonts.first; + uiStyle *style = U.uistyles.first; /* recover from uninitialized dpi */ if (U.dpi == 0) - U.dpi= 72; + U.dpi = 72; CLAMP(U.dpi, 48, 128); /* default builtin */ - if (font==NULL) { - font= MEM_callocN(sizeof(uiFont), "ui font"); + if (font == NULL) { + font = MEM_callocN(sizeof(uiFont), "ui font"); BLI_addtail(&U.uifonts, font); BLI_strncpy(font->filename, "default", sizeof(font->filename)); - font->uifont_id= UIFONT_DEFAULT; + font->uifont_id = UIFONT_DEFAULT; } - for (font= U.uifonts.first; font; font= font->next) { + for (font = U.uifonts.first; font; font = font->next) { - if (font->uifont_id==UIFONT_DEFAULT) { + if (font->uifont_id == UIFONT_DEFAULT) { #ifdef WITH_INTERNATIONAL - int font_size= datatoc_bfont_ttf_size; - unsigned char *font_ttf= (unsigned char*)datatoc_bfont_ttf; + int font_size = datatoc_bfont_ttf_size; + unsigned char *font_ttf = (unsigned char *)datatoc_bfont_ttf; static int last_font_size = 0; /* use unicode font for translation */ if (U.transopts & USER_DOTRANSLATE) { - font_ttf= BLF_get_unifont(&font_size); + font_ttf = BLF_get_unifont(&font_size); if (!font_ttf) { /* fall back if not found */ - font_size= datatoc_bfont_ttf_size; - font_ttf= (unsigned char*)datatoc_bfont_ttf; + font_size = datatoc_bfont_ttf_size; + font_ttf = (unsigned char *)datatoc_bfont_ttf; } } @@ -344,15 +344,15 @@ void uiStyleInit(void) last_font_size = font_size; } - font->blf_id= BLF_load_mem("default", font_ttf, font_size); + font->blf_id = BLF_load_mem("default", font_ttf, font_size); #else - font->blf_id= BLF_load_mem("default", (unsigned char*)datatoc_bfont_ttf, datatoc_bfont_ttf_size); + font->blf_id = BLF_load_mem("default", (unsigned char *)datatoc_bfont_ttf, datatoc_bfont_ttf_size); #endif } else { - font->blf_id= BLF_load(font->filename); + font->blf_id = BLF_load(font->filename); if (font->blf_id == -1) - font->blf_id= BLF_load_mem("default", (unsigned char*)datatoc_bfont_ttf, datatoc_bfont_ttf_size); + font->blf_id = BLF_load_mem("default", (unsigned char *)datatoc_bfont_ttf, datatoc_bfont_ttf_size); } if (font->blf_id == -1) { @@ -370,26 +370,26 @@ void uiStyleInit(void) } } - if (style==NULL) { - ui_style_new(&U.uistyles, "Default Style", UIFONT_DEFAULT ); + if (style == NULL) { + ui_style_new(&U.uistyles, "Default Style", UIFONT_DEFAULT); } // XXX, this should be moved into a style, but for now best only load the monospaced font once. if (blf_mono_font == -1) - blf_mono_font= BLF_load_mem_unique("monospace", (unsigned char *)datatoc_bmonofont_ttf, datatoc_bmonofont_ttf_size); + blf_mono_font = BLF_load_mem_unique("monospace", (unsigned char *)datatoc_bmonofont_ttf, datatoc_bmonofont_ttf_size); BLF_size(blf_mono_font, 12, 72); /* second for rendering else we get threading problems */ if (blf_mono_font_render == -1) - blf_mono_font_render= BLF_load_mem_unique("monospace", (unsigned char *)datatoc_bmonofont_ttf, datatoc_bmonofont_ttf_size); + blf_mono_font_render = BLF_load_mem_unique("monospace", (unsigned char *)datatoc_bmonofont_ttf, datatoc_bmonofont_ttf_size); BLF_size(blf_mono_font_render, 12, 72); } void uiStyleFontSet(uiFontStyle *fs) { - uiFont *font= uifont_to_blfont(fs->uifont_id); + uiFont *font = uifont_to_blfont(fs->uifont_id); BLF_size(font->blf_id, fs->points, U.dpi); } |