Index: ps/trunk/binaries/data/mods/public/gui/common/modern/sprites.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/modern/sprites.xml (revision 14475)
+++ ps/trunk/binaries/data/mods/public/gui/common/modern/sprites.xml (revision 14476)
@@ -1,270 +1,273 @@
Index: ps/trunk/source/gui/CCheckBox.cpp
===================================================================
--- ps/trunk/source/gui/CCheckBox.cpp (revision 14475)
+++ ps/trunk/source/gui/CCheckBox.cpp (revision 14476)
@@ -1,186 +1,150 @@
/* Copyright (C) 2013 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* 0 A.D. is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with 0 A.D. If not, see .
*/
/*
CCheckBox
*/
#include "precompiled.h"
#include "CCheckBox.h"
#include "ps/CLogger.h"
#include "ps/CStrIntern.h"
#include "graphics/FontMetrics.h"
//-------------------------------------------------------------------
// Constructor / Destructor
//-------------------------------------------------------------------
CCheckBox::CCheckBox()
{
AddSetting(GUIST_float, "buffer_zone");
AddSetting(GUIST_CGUIString, "caption");
AddSetting(GUIST_int, "cell_id");
AddSetting(GUIST_bool, "checked");
AddSetting(GUIST_CStrW, "font");
AddSetting(GUIST_CStrW, "sound_disabled");
AddSetting(GUIST_CStrW, "sound_enter");
AddSetting(GUIST_CStrW, "sound_leave");
AddSetting(GUIST_CStrW, "sound_pressed");
AddSetting(GUIST_CStrW, "sound_released");
AddSetting(GUIST_CGUISpriteInstance, "sprite");
AddSetting(GUIST_CGUISpriteInstance, "sprite_over");
AddSetting(GUIST_CGUISpriteInstance, "sprite_pressed");
AddSetting(GUIST_CGUISpriteInstance, "sprite_disabled");
AddSetting(GUIST_CGUISpriteInstance, "sprite2");
AddSetting(GUIST_CGUISpriteInstance, "sprite2_over");
AddSetting(GUIST_CGUISpriteInstance, "sprite2_pressed");
AddSetting(GUIST_CGUISpriteInstance, "sprite2_disabled");
AddSetting(GUIST_float, "square_side");
AddSetting(GUIST_CColor, "textcolor");
AddSetting(GUIST_CColor, "textcolor_over");
AddSetting(GUIST_CColor, "textcolor_pressed");
AddSetting(GUIST_CColor, "textcolor_disabled");
AddSetting(GUIST_CStrW, "tooltip");
AddSetting(GUIST_CStr, "tooltip_style");
// Add text
AddText(new SGUIText());
}
CCheckBox::~CCheckBox()
{
}
void CCheckBox::SetupText()
{
if (!GetGUI())
return;
ENSURE(m_GeneratedTexts.size()==1);
CStrW font;
if (GUI::GetSetting(this, "font", font) != PSRETURN_OK || font.empty())
// Use the default if none is specified
// TODO Gee: (2004-08-14) Default should not be hard-coded, but be in styles!
font = L"default";
float square_side;
GUI::GetSetting(this, "square_side", square_side);
CGUIString caption;
GUI::GetSetting(this, "caption", caption);
float buffer_zone=0.f;
GUI::GetSetting(this, "buffer_zone", buffer_zone);
*m_GeneratedTexts[0] = GetGUI()->GenerateText(caption, font, m_CachedActualSize.GetWidth()-square_side, 0.f, this);
}
void CCheckBox::HandleMessage(SGUIMessage &Message)
{
// Important
IGUIButtonBehavior::HandleMessage(Message);
IGUITextOwner::HandleMessage(Message);
switch (Message.type)
{
case GUIM_PRESSED:
{
bool checked;
// Switch to opposite.
GUI::GetSetting(this, "checked", checked);
checked = !checked;
GUI::SetSetting(this, "checked", checked);
break;
}
default:
break;
}
}
void CCheckBox::Draw()
{
- ////////// Gee: janwas, this is just temp to see it
- glDisable(GL_TEXTURE_2D);
- //////////
-
- float square_side, buffer_zone;
- CStrW font_name;
+ float bz = GetBufferedZ();
bool checked;
int cell_id;
- GUI::GetSetting(this, "square_side", square_side);
- GUI::GetSetting(this, "buffer_zone", buffer_zone);
- GUI::GetSetting(this, "font", font_name);
+ CGUISpriteInstance *sprite, *sprite_over, *sprite_pressed, *sprite_disabled;
+
GUI::GetSetting(this, "checked", checked);
GUI::GetSetting(this, "cell_id", cell_id);
- // Get line height
- CFontMetrics font (CStrIntern(font_name.ToUTF8()));
- float line_height = (float)font.GetHeight();
-
- float bz = GetBufferedZ();
-
- // Get square
- CRect rect;
-
- rect.left = m_CachedActualSize.left;
- rect.right = rect.left + square_side;
-
- if (square_side >= line_height)
- rect.top = m_CachedActualSize.top;
- else
- rect.top = m_CachedActualSize.top + line_height/2.f - square_side/2.f;
-
- rect.bottom = rect.top + square_side;
-
- CGUISpriteInstance *sprite, *sprite_over, *sprite_pressed, *sprite_disabled;
-
if (checked)
{
GUI::GetSettingPointer(this, "sprite2", sprite);
GUI::GetSettingPointer(this, "sprite2_over", sprite_over);
GUI::GetSettingPointer(this, "sprite2_pressed", sprite_pressed);
GUI::GetSettingPointer(this, "sprite2_disabled", sprite_disabled);
}
else
{
GUI::GetSettingPointer(this, "sprite", sprite);
GUI::GetSettingPointer(this, "sprite_over", sprite_over);
GUI::GetSettingPointer(this, "sprite_pressed", sprite_pressed);
GUI::GetSettingPointer(this, "sprite_disabled", sprite_disabled);
}
- DrawButton(rect,
+ DrawButton(m_CachedActualSize,
bz,
*sprite,
*sprite_over,
*sprite_pressed,
*sprite_disabled,
cell_id);
-
- CColor color = ChooseColor();
-
- CPos text_pos(m_CachedActualSize.left + square_side + buffer_zone, m_CachedActualSize.top);
-
- if (square_side > line_height)
- text_pos.y += square_side/2.f - line_height/2.f;
-
- DrawText(0, color, text_pos, bz+0.1f, m_CachedActualSize);
}