townforge/tb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use constexpr ids for setting default skin on widgets.

Browse Source
This commit is contained in:
Emil Segerås 2014-03-16 13:11:53 +01:00
parent 07aaa133d3
commit 4d50b23b73
13 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Demo/demo01/Demo01.cpp
View File

@ -366,7 +366,7 @@ bool ScrollContainerWindow::OnEvent(const TBWidgetEvent &ev)
{
TBButton *button = TBSafeCast<TBButton>(ev.target);
TBSkinImage *skin_image = new TBSkinImage;
skin_image->SetSkinBg("Icon16");
skin_image->SetSkinBg(TBIDC("Icon16"));
button->GetContentRoot()->AddChild(skin_image, WIDGET_Z_BOTTOM);
return true;
}
@ -886,7 +886,7 @@ int app_main()
"¡Ã¢Ã£Ã¤Ã¥Ã¦Ã§Ã¨Ã©ÃªÃ«Ã¬Ã­Ã®Ã¯Ã°Ã±Ã²Ã³Ã´ÃµÃ¶Ã·Ã¸Ã¹ÃºÃ»Ã¼Ã½Ã¾Ã¿");
// Give the root widget a background skin
application->GetRoot()->SetSkinBg("background");
application->GetRoot()->SetSkinBg(TBIDC("background"));
application->Init();
application->Run();

2
Demo/demo01/ListWindow.cpp
View File

@ -8,7 +8,7 @@ AdvancedItemWidget::AdvancedItemWidget(AdvancedItem *item, AdvancedItemSource *s
, m_source_viewer(source_viewer)
, m_index(index)
{
SetSkinBg("TBSelectItem");
SetSkinBg(TBIDC("TBSelectItem"));
SetLayoutDistribution(LAYOUT_DISTRIBUTION_GRAVITY);
SetLayoutDistributionPosition(LAYOUT_DISTRIBUTION_POSITION_LEFT_TOP);
SetPaintOverflowFadeout(false);

2
src/tb/tb_editfield.cpp
View File

@ -53,7 +53,7 @@ TBEditField::TBEditField()
m_scrollbar_x.SetOpacity(0);
m_scrollbar_y.SetOpacity(0);
SetSkinBg("TBEditField", WIDGET_INVOKE_INFO_NO_CALLBACKS);
SetSkinBg(TBIDC("TBEditField"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
m_style_edit.SetListener(this);
m_root.SetRect(GetVisibleRect());

14
src/tb/tb_inline_select.cpp
View File

@ -19,7 +19,7 @@ TBInlineSelect::TBInlineSelect()
, m_min(0)
, m_max(100)
{
SetSkinBg("TBInlineSelect");
SetSkinBg(TBIDC("TBInlineSelect"));
AddChild(&m_layout);
m_layout.AddChild(&m_buttons[0]);
m_layout.AddChild(&m_editfield);
@ -27,14 +27,14 @@ TBInlineSelect::TBInlineSelect()
m_layout.SetRect(GetPaddingRect());
m_layout.SetGravity(WIDGET_GRAVITY_ALL);
m_layout.SetSpacing(0);
m_buttons[0].SetSkinBg("TBButton.flat");
m_buttons[1].SetSkinBg("TBButton.flat");
m_buttons[0].GetContentRoot()->AddChild(new TBSkinImage("arrow.left"));
m_buttons[1].GetContentRoot()->AddChild(new TBSkinImage("arrow.right"));
m_buttons[0].SetSkinBg(TBIDC("TBButton.flat"));
m_buttons[1].SetSkinBg(TBIDC("TBButton.flat"));
m_buttons[0].GetContentRoot()->AddChild(new TBSkinImage(TBIDC("arrow.left")));
m_buttons[1].GetContentRoot()->AddChild(new TBSkinImage(TBIDC("arrow.right")));
m_buttons[0].SetIsFocusable(false);
m_buttons[1].SetIsFocusable(false);
m_buttons[0].GetID().Set("dec");
m_buttons[1].GetID().Set("inc");
m_buttons[0].SetID(TBIDC("dec"));
m_buttons[1].SetID(TBIDC("inc"));
m_buttons[0].SetAutoRepeat(true);
m_buttons[1].SetAutoRepeat(true);
m_editfield.SetTextAlign(TB_TEXT_ALIGN_CENTER);

2
src/tb/tb_menu_window.cpp
View File

@ -14,7 +14,7 @@ TBMenuWindow::TBMenuWindow(TBWidget *target, TBID id)
: TBPopupWindow(target)
{
SetID(id);
SetSkinBg("TBMenuWindow", WIDGET_INVOKE_INFO_NO_CALLBACKS);
SetSkinBg(TBIDC("TBMenuWindow"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
m_select_list.GetScrollContainer()->SetAdaptToContentSize(true);
m_select_list.SetIsFocusable(false); ///< Avoid it autoclosing its window on click
m_select_list.SetSkinBg("");

2
src/tb/tb_popup_window.cpp
View File

@ -74,7 +74,7 @@ TBPopupWindow::TBPopupWindow(TBWidget *target)
: m_target(target)
{
TBWidgetListener::AddGlobalListener(this);
SetSkinBg("TBPopupWindow", WIDGET_INVOKE_INFO_NO_CALLBACKS);
SetSkinBg(TBIDC("TBPopupWindow"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
SetSettings(WINDOW_SETTINGS_NONE);
}

8
src/tb/tb_select.cpp
View File

@ -57,7 +57,7 @@ TBSelectList::TBSelectList()
{
SetSource(&m_default_source);
SetIsFocusable(true);
SetSkinBg("TBSelectList", WIDGET_INVOKE_INFO_NO_CALLBACKS);
SetSkinBg(TBIDC("TBSelectList"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
m_container.SetGravity(WIDGET_GRAVITY_ALL);
m_container.SetRect(GetPaddingRect());
AddChild(&m_container);
@ -391,8 +391,8 @@ TBSelectDropdown::TBSelectDropdown()
: m_value(-1)
{
SetSource(&m_default_source);
SetSkinBg("TBSelectDropdown", WIDGET_INVOKE_INFO_NO_CALLBACKS);
m_arrow.SetSkinBg("TBSelectDropdown.arrow", WIDGET_INVOKE_INFO_NO_CALLBACKS);
SetSkinBg(TBIDC("TBSelectDropdown"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
m_arrow.SetSkinBg(TBIDC("TBSelectDropdown.arrow"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
GetContentRoot()->AddChild(&m_arrow);
}
@ -444,7 +444,7 @@ void TBSelectDropdown::OpenWindow()
if (TBMenuWindow *window = new TBMenuWindow(this, TBIDC("TBSelectDropdown.window")))
{
m_window_pointer.Set(window);
window->SetSkinBg("TBSelectDropdown.window");
window->SetSkinBg(TBIDC("TBSelectDropdown.window"));
window->Show(m_source, TBPopupAlignment(), GetValue());
}
}

6
src/tb/tb_select_item.cpp
View File

@ -41,7 +41,7 @@ TBSimpleLayoutItemWidget::TBSimpleLayoutItemWidget(TBID image, TBSelectItemSourc
: m_source(source)
, m_menu(nullptr)
{
SetSkinBg("TBSelectItem");
SetSkinBg(TBIDC("TBSelectItem"));
SetLayoutDistribution(LAYOUT_DISTRIBUTION_AVAILABLE);
SetPaintOverflowFadeout(false);
@ -59,7 +59,7 @@ TBSimpleLayoutItemWidget::TBSimpleLayoutItemWidget(TBID image, TBSelectItemSourc
if (source)
{
m_image_arrow.SetSkinBg("arrow.right");
m_image_arrow.SetSkinBg(TBIDC("arrow.right"));
m_image_arrow.SetIgnoreInput(true);
AddChild(&m_image_arrow);
}
@ -166,7 +166,7 @@ TBWidget *TBSelectItemSource::CreateItemWidget(int index, TBSelectItemViewer *vi
if (TBSeparator *separator = new TBSeparator)
{
separator->SetGravity(WIDGET_GRAVITY_ALL);
separator->SetSkinBg("TBSelectItem.separator");
separator->SetSkinBg(TBIDC("TBSelectItem.separator"));
return separator;
}
}

11
src/tb/tb_tab_container.cpp
View File

@ -24,7 +24,7 @@ void TBTabLayout::OnChildAdded(TBWidget *child)
if (TBButton *button = TBSafeCast<TBButton>(child))
{
button->SetSqueezable(true);
button->SetSkinBg("TBTabContainer.tab");
button->SetSkinBg(TBIDC("TBTabContainer.tab"));
button->SetID(TBIDC("tab"));
}
}
@ -59,12 +59,12 @@ TBTabContainer::TBTabContainer()
m_root_layout.SetGravity(WIDGET_GRAVITY_ALL);
m_root_layout.SetLayoutDistribution(LAYOUT_DISTRIBUTION_AVAILABLE);
m_root_layout.SetLayoutOrder(LAYOUT_ORDER_TOP_TO_BOTTOM);
m_root_layout.SetSkinBg("TBTabContainer.rootlayout");
m_root_layout.SetSkinBg(TBIDC("TBTabContainer.rootlayout"));
m_tab_layout.SetLayoutDistributionPosition(LAYOUT_DISTRIBUTION_POSITION_CENTER);
m_tab_layout.SetSkinBg("TBTabContainer.tablayout_x");
m_tab_layout.SetSkinBg(TBIDC("TBTabContainer.tablayout_x"));
m_tab_layout.SetLayoutPosition(LAYOUT_POSITION_RIGHT_BOTTOM);
m_content_root.SetGravity(WIDGET_GRAVITY_ALL);
m_content_root.SetSkinBg("TBTabContainer.container");
m_content_root.SetSkinBg(TBIDC("TBTabContainer.container"));
}
TBTabContainer::~TBTabContainer()
@ -78,7 +78,8 @@ void TBTabContainer::SetAxis(AXIS axis)
{
m_root_layout.SetAxis(axis);
m_tab_layout.SetAxis(axis == AXIS_X ? AXIS_Y : AXIS_X);
m_tab_layout.SetSkinBg(axis == AXIS_X ? "TBTabContainer.tablayout_y" : "TBTabContainer.tablayout_x");
m_tab_layout.SetSkinBg(axis == AXIS_X ? TBIDC("TBTabContainer.tablayout_y") :
TBIDC("TBTabContainer.tablayout_x"));
}
void TBTabContainer::SetCurrentPage(int index)

10
src/tb/tb_toggle_container.cpp
View File

@ -15,7 +15,7 @@ TB_WIDGET_FACTORY(TBSectionHeader, TBValue::TYPE_INT, WIDGET_Z_TOP) { }
TBSectionHeader::TBSectionHeader()
{
SetSkinBg("TBSectionHeader");
SetSkinBg(TBIDC("TBSectionHeader"));
SetGravity(WIDGET_GRAVITY_LEFT | WIDGET_GRAVITY_RIGHT);
SetToggleMode(true);
}
@ -44,10 +44,10 @@ TBSection::TBSection()
{
SetGravity(WIDGET_GRAVITY_LEFT | WIDGET_GRAVITY_RIGHT);
SetSkinBg("TBSection", WIDGET_INVOKE_INFO_NO_CALLBACKS);
m_layout.SetSkinBg("TBSection.layout", WIDGET_INVOKE_INFO_NO_CALLBACKS);
SetSkinBg(TBIDC("TBSection"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
m_layout.SetSkinBg(TBIDC("TBSection.layout"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
m_toggle_container.SetSkinBg("TBSection.container");
m_toggle_container.SetSkinBg(TBIDC("TBSection.container"));
m_toggle_container.SetToggle(TBToggleContainer::TOGGLE_EXPANDED);
m_toggle_container.SetGravity(WIDGET_GRAVITY_ALL);
m_layout.SetAxis(AXIS_Y);
@ -107,7 +107,7 @@ TBToggleContainer::TBToggleContainer()
, m_invert(false)
, m_value(0)
{
SetSkinBg("TBToggleContainer", WIDGET_INVOKE_INFO_NO_CALLBACKS);
SetSkinBg(TBIDC("TBToggleContainer"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
}
void TBToggleContainer::SetToggle(TOGGLE toggle)

34
src/tb/tb_widgets_common.cpp
View File

@ -77,7 +77,7 @@ TBTextField::TBTextField()
: m_cached_text_width(UPDATE_TEXT_WIDTH_CACHE)
, m_squeezable(false)
{
SetSkinBg("TBTextField", WIDGET_INVOKE_INFO_NO_CALLBACKS);
SetSkinBg(TBIDC("TBTextField"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
}
bool TBTextField::SetText(const char *text)
@ -137,7 +137,7 @@ TBButton::TBButton()
{
SetIsFocusable(true);
SetClickByKey(true);
SetSkinBg("TBButton", WIDGET_INVOKE_INFO_NO_CALLBACKS);
SetSkinBg(TBIDC("TBButton"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
AddChild(&m_layout);
// Set the textfield gravity to all, even though it would display the same with default gravity.
// This will make the buttons layout expand if there is space available, without forcing the parent
@ -275,7 +275,7 @@ PreferredSize TBSkinImage::OnCalculatePreferredSize(const SizeConstraints &const
TBSeparator::TBSeparator()
{
SetSkinBg("TBSeparator", WIDGET_INVOKE_INFO_NO_CALLBACKS);
SetSkinBg(TBIDC("TBSeparator"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
SetState(WIDGET_STATE_DISABLED, true);
}
@ -289,8 +289,8 @@ TBProgressSpinner::TBProgressSpinner()
: m_value(0)
, m_frame(0)
{
SetSkinBg("TBProgressSpinner", WIDGET_INVOKE_INFO_NO_CALLBACKS);
m_skin_fg.Set("TBProgressSpinner.fg");
SetSkinBg(TBIDC("TBProgressSpinner"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
m_skin_fg.Set(TBIDC("TBProgressSpinner.fg"));
}
void TBProgressSpinner::SetValue(int value)
@ -427,13 +427,13 @@ void TBScrollBar::SetAxis(AXIS axis)
m_axis = axis;
if (axis == AXIS_X)
{
SetSkinBg("TBScrollBarBgX", WIDGET_INVOKE_INFO_NO_CALLBACKS);
m_handle.SetSkinBg("TBScrollBarFgX", WIDGET_INVOKE_INFO_NO_CALLBACKS);
SetSkinBg(TBIDC("TBScrollBarBgX"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
m_handle.SetSkinBg(TBIDC("TBScrollBarFgX"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
}
else
{
SetSkinBg("TBScrollBarBgY", WIDGET_INVOKE_INFO_NO_CALLBACKS);
m_handle.SetSkinBg("TBScrollBarFgY", WIDGET_INVOKE_INFO_NO_CALLBACKS);
SetSkinBg(TBIDC("TBScrollBarBgY"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
m_handle.SetSkinBg(TBIDC("TBScrollBarFgY"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
}
Invalidate();
}
@ -573,13 +573,13 @@ void TBSlider::SetAxis(AXIS axis)
m_axis = axis;
if (axis == AXIS_X)
{
SetSkinBg("TBSliderBgX", WIDGET_INVOKE_INFO_NO_CALLBACKS);
m_handle.SetSkinBg("TBSliderFgX", WIDGET_INVOKE_INFO_NO_CALLBACKS);
SetSkinBg(TBIDC("TBSliderBgX"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
m_handle.SetSkinBg(TBIDC("TBSliderFgX"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
}
else
{
SetSkinBg("TBSliderBgY", WIDGET_INVOKE_INFO_NO_CALLBACKS);
m_handle.SetSkinBg("TBSliderFgY", WIDGET_INVOKE_INFO_NO_CALLBACKS);
SetSkinBg(TBIDC("TBSliderBgY"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
m_handle.SetSkinBg(TBIDC("TBSliderFgY"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
}
Invalidate();
}
@ -682,14 +682,14 @@ void TBSlider::OnResized(int old_w, int old_h)
TBContainer::TBContainer()
{
SetSkinBg("TBContainer", WIDGET_INVOKE_INFO_NO_CALLBACKS);
SetSkinBg(TBIDC("TBContainer"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
}
// == TBMover =======================================
TBMover::TBMover()
{
SetSkinBg("TBMover", WIDGET_INVOKE_INFO_NO_CALLBACKS);
SetSkinBg(TBIDC("TBMover"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
}
bool TBMover::OnEvent(const TBWidgetEvent &ev)
@ -718,7 +718,7 @@ bool TBMover::OnEvent(const TBWidgetEvent &ev)
TBResizer::TBResizer()
{
SetSkinBg("TBResizer", WIDGET_INVOKE_INFO_NO_CALLBACKS);
SetSkinBg(TBIDC("TBResizer"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
}
WIDGET_HIT_STATUS TBResizer::GetHitStatus(int x, int y)
@ -757,7 +757,7 @@ bool TBResizer::OnEvent(const TBWidgetEvent &ev)
TBDimmer::TBDimmer()
{
SetSkinBg("TBDimmer", WIDGET_INVOKE_INFO_NO_CALLBACKS);
SetSkinBg(TBIDC("TBDimmer"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
SetGravity(WIDGET_GRAVITY_ALL);
}

4
src/tb/tb_widgets_common.h
View File

@ -252,7 +252,7 @@ public:
// For safe typecasting
TBOBJECT_SUBCLASS(TBCheckBox, TBRadioCheckBox);
TBCheckBox() { SetSkinBg("TBCheckBox", WIDGET_INVOKE_INFO_NO_CALLBACKS); }
TBCheckBox() { SetSkinBg(TBIDC("TBCheckBox"), WIDGET_INVOKE_INFO_NO_CALLBACKS); }
};
/** TBRadioButton is a button which unselects other radiobuttons of the same
@ -264,7 +264,7 @@ public:
// For safe typecasting
TBOBJECT_SUBCLASS(TBRadioButton, TBRadioCheckBox);
TBRadioButton() { SetSkinBg("TBRadioButton", WIDGET_INVOKE_INFO_NO_CALLBACKS); }
TBRadioButton() { SetSkinBg(TBIDC("TBRadioButton"), WIDGET_INVOKE_INFO_NO_CALLBACKS); }
};
/** TBScrollBar is a scroll bar in the given axis. */

8
src/tb/tb_window.cpp
View File

@ -13,16 +13,16 @@ namespace tb {
TBWindow::TBWindow()
: m_settings(WINDOW_SETTINGS_DEFAULT)
{
SetSkinBg("TBWindow", WIDGET_INVOKE_INFO_NO_CALLBACKS);
SetSkinBg(TBIDC("TBWindow"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
AddChild(&m_mover);
AddChild(&m_resizer);
m_mover.SetSkinBg("TBWindow.mover");
m_mover.SetSkinBg(TBIDC("TBWindow.mover"));
m_mover.AddChild(&m_textfield);
m_textfield.SetIgnoreInput(true);
m_mover.AddChild(&m_close_button);
m_close_button.SetSkinBg("TBWindow.close");
m_close_button.SetSkinBg(TBIDC("TBWindow.close"));
m_close_button.SetIsFocusable(false);
m_close_button.GetID().Set("TBWindow.close");
m_close_button.SetID(TBIDC("TBWindow.close"));
SetIsGroupRoot(true);
}