0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch unit_preview_pane image_facing key to image_mods

Browse source
This commit is contained in:
Charles Dang 2016-08-01 08:14:19 +11:00
parent 7dbf17f3fe
commit 6080cfb969
4 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/gui/schema.cfg
View file

@ -1931,7 +1931,7 @@
super="gui/window/resolution/grid"
[/tag]
[key]
name="image_facing"
name="image_mods"
type="string"
default="right"
[/key]

2
data/gui/window/unit_attack.cfg
View file

@ -179,7 +179,7 @@
[unit_preview_pane]
id = "defender_pane"
definition = "unit_minimal_right"
image_facing = "left"
image_mods = "~FL(horiz)"
[/unit_preview_pane]
[/column]

17
src/gui/widgets/unit_preview_pane.cpp
View file

@ -211,10 +211,7 @@ void tunit_preview_pane::set_displayed_unit(const unit* unit)
mods += "~BLIT(" + overlay + ")";
}
// We assume sprites are always drawn facing right
if(image_facing_ == "left") {
mods += "~FL(horiz)";
}
mods += image_mods_;
icon_type_->set_label(unit->absolute_image() + mods);
}
@ -310,13 +307,9 @@ void tunit_preview_pane::profile_button_callback()
}
}
void tunit_preview_pane::set_image_facing(const std::string& facing)
void tunit_preview_pane::set_image_mods(const std::string& mods)
{
if(facing != "left" && facing != "right") {
return;
}
image_facing_ = facing;
image_mods_ = mods;
}
void tunit_preview_pane::set_active(const bool /*active*/)
@ -374,7 +367,7 @@ namespace implementation
tbuilder_unit_preview_pane::tbuilder_unit_preview_pane(const config& cfg)
: tbuilder_control(cfg)
, image_facing_(cfg["image_facing"])
, image_mods_(cfg["image_mods"])
{
}
@ -395,7 +388,7 @@ twidget* tbuilder_unit_preview_pane::build() const
widget->init_grid(conf->grid);
widget->finalize_setup();
widget->set_image_facing(image_facing_);
widget->set_image_mods(image_mods_);
return widget;
}

10
src/gui/widgets/unit_preview_pane.hpp
View file

@ -42,7 +42,7 @@ class tunit_preview_pane : public tcontainer_
public:
tunit_preview_pane()
: tcontainer_(1)
, current_type_("")
, current_type_()
, icon_type_(nullptr)
, icon_race_(nullptr)
, icon_alignment_(nullptr)
@ -50,7 +50,7 @@ public:
, label_level_(nullptr)
, label_details_(nullptr)
, button_profile_(nullptr)
, image_facing_("right")
, image_mods_()
{
}
@ -61,7 +61,7 @@ public:
void set_displayed_unit(const unit* unit);
/** Sets the facing of the unit image */
void set_image_facing(const std::string& facing);
void set_image_mods(const std::string& mods);
/** Callback for the profile button */
void profile_button_callback();
@ -96,7 +96,7 @@ private:
tbutton* button_profile_;
std::string image_facing_;
std::string image_mods_;
enum tstate {
ENABLED
@ -140,7 +140,7 @@ public:
twidget* build() const;
private:
std::string image_facing_;
const std::string image_mods_;
};
} // namespace implementation