From 2ca8b2683ea7cf3c80024cab841ac9d28959632b Mon Sep 17 00:00:00 2001 From: marynate Date: Tue, 13 Jan 2015 17:30:44 +0800 Subject: Minor code formatting --- scene/resources/default_theme/default_theme.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index 1f0b5f1545..8264601786 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -168,8 +168,6 @@ void make_default_theme() { tex_cache = memnew( TexCacheMap ); -// uint32_t last=OS::get_singleton()->get_ticks_msec(); - Ref t( memnew( Theme ) ); //Ref default_font = make_font(_bi_font_normal_height,_bi_font_normal_ascent,_bi_font_normal_valign,_bi_font_normal_charcount,_bi_font_normal_characters,make_icon(font_normal_png)); @@ -177,7 +175,6 @@ void make_default_theme() { Ref source_font=make_font2(_builtin_source_font_height,_builtin_source_font_ascent,_builtin_source_font_charcount,&_builtin_source_font_charrects[0][0],_builtin_source_font_kerning_pair_count,&_builtin_source_font_kerning_pairs[0][0],_builtin_source_font_img_width,_builtin_source_font_img_height,_builtin_source_font_img_data); Ref large_font=make_font2(_builtin_large_font_height,_builtin_large_font_ascent,_builtin_large_font_charcount,&_builtin_large_font_charrects[0][0],_builtin_large_font_kerning_pair_count,&_builtin_large_font_kerning_pairs[0][0],_builtin_large_font_img_width,_builtin_large_font_img_height,_builtin_large_font_img_data); - // Font Colors Color control_font_color = Color::html("e0e0e0"); @@ -188,7 +185,6 @@ void make_default_theme() { Color font_color_selection = Color::html("7d7d7d"); - // Panel t->set_stylebox("panel","Panel", make_stylebox( panel_bg_png,0,0,0,0) ); @@ -524,6 +520,9 @@ void make_default_theme() { t->set_constant("hseparation","PopupMenu",4); t->set_constant("vseparation","PopupMenu",4); + + // GraphNode + Ref graphsb = make_stylebox(graph_node_png,6,24,6,5,16,24,16,5); //graphsb->set_expand_margin_size(MARGIN_LEFT,10); //graphsb->set_expand_margin_size(MARGIN_RIGHT,10); @@ -539,7 +538,7 @@ void make_default_theme() { // Tree - + Ref tree_selected = make_stylebox( selection_png,4,4,4,4,8,0,8,0); Ref tree_selected_oof = make_stylebox( selection_oof_png,4,4,4,4,8,0,8,0); @@ -739,7 +738,7 @@ void make_default_theme() { t->set_constant("icon_separator","HButtonArray", 4 ); t->set_constant("button_separator","HButtonArray", 8 ); - + t->set_stylebox("focus","HButtonArray", focus ); -- cgit v1.2.3