From f030154fe727e25a2afe1f78b3998c2d2dba95e4 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Tue, 18 Aug 2009 09:24:15 +0000 Subject: astyle cleanup, corrects not loading of material textures --- src/ui/palette.cc | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/ui/palette.cc') diff --git a/src/ui/palette.cc b/src/ui/palette.cc index 2dec462..6492dc3 100644 --- a/src/ui/palette.cc +++ b/src/ui/palette.cc @@ -11,20 +11,20 @@ namespace ui { Palette::Palette() : - palette_foreground(1.0f, 1.0f), - palette_background(0.5f, 0.75f), - palette_border(0.0f, 0.8f, 0.0f, 0.5f), - palette_text(0.75f, 1.0f), - palette_highlight(1.0f, 1.0f, 0.5f), - palette_disabled(0.5f, 0.5f, 0.5f, 1.0f), - palette_pointer(0.0f, 0.75f, 0.0f, 1.0f), - palette_active(0.0f, 1.0f, 0.0f, 1.0f), - palette_debug(0.50f, 0.75f), - palette_mission(1.0f, 0.5f, 1.0f, 1.0f), - palette_bold(1.0f, 1.0f), - palette_fancy(0.0f, 1.0f, 0.0f, 1.0f), - palette_warning(1.0f, 1.0f, 0.0f, 1.0f), - palette_error(1.0f, 0.0f, 0.0f, 1.0f) + palette_foreground(1.0f, 1.0f), + palette_background(0.5f, 0.75f), + palette_border(0.0f, 0.8f, 0.0f, 0.5f), + palette_text(0.75f, 1.0f), + palette_highlight(1.0f, 1.0f, 0.5f), + palette_disabled(0.5f, 0.5f, 0.5f, 1.0f), + palette_pointer(0.0f, 0.75f, 0.0f, 1.0f), + palette_active(0.0f, 1.0f, 0.0f, 1.0f), + palette_debug(0.50f, 0.75f), + palette_mission(1.0f, 0.5f, 1.0f, 1.0f), + palette_bold(1.0f, 1.0f), + palette_fancy(0.0f, 1.0f, 0.0f, 1.0f), + palette_warning(1.0f, 1.0f, 0.0f, 1.0f), + palette_error(1.0f, 0.0f, 0.0f, 1.0f) { } @@ -35,7 +35,7 @@ Palette::~Palette() const math::Color &Palette::color(Color palettecolor) const { - switch(palettecolor) { + switch (palettecolor) { case Foreground: return foreground(); break; -- cgit v1.2.3