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

Fixed widescreen theme on low resolutions.

Browse source 
Added tod support on the left sidebar.
This commit is contained in:
Fabian Müller 2011-09-23 20:29:13 +00:00
parent f00de9fe69
commit c64fd57a77
2 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
data/themes/widescreen.cfg
View file

@ -336,6 +336,14 @@
yanchor=fixed
[/time_of_day]
[selected_time_of_day]
id=selected-image-tod
ref=top-left-panel
rect="=+7,=+159,=-7,+39"
xanchor=fixed
yanchor=fixed
[/selected_time_of_day]
#put the side playing indicator next to the turn indicator
[side_playing]
id=icon-sideplaying
@ -750,6 +758,11 @@
id=image-tod
rect="=+10,=+119,=-7,+39"
[/change]
# shift tod image up by 40px rel to 768px
[change]
id=selected-image-tod
rect="=+7,=+119,=-7,+39"
[/change]
# fixing this one fixes HP/XP/unit status
[change]
id=label-hp
@ -759,13 +772,22 @@
[change]
id=selected-label-hp
font_size={DEFAULT_FONT_TINY}
rect="=+84,=+129,+54,+12"
rect="=+4,=+169,+54,+12"
[/change]
# shift unit profile up by 40px rel to 768px
[change]
id=selected-unit-profile
rect="=+6,=+11,+100,+100"
[/change]
# shift unit image up by 40px rel to 768px
[change]
id=unit-image
rect="=+9,=+175,+72,+72"
[/change]
[change]
id=selected-unit-image
rect="=+65,=+175,+72,+72"
[/change]
[change]
id=button-endturn
rect="=+17,=+3,+80,+20"

15
src/reports.cpp
View file

@ -720,7 +720,6 @@ REPORT_GENERATOR(unit_image)
if (!u) return report();
return image_report(u->absolute_image() + u->image_mods());
}
REPORT_GENERATOR(selected_unit_image)
{
unit *u = get_selected_unit();
@ -735,7 +734,6 @@ REPORT_GENERATOR(selected_unit_profile)
if (!u) return report();
return image_report(u->small_profile());
}
REPORT_GENERATOR(unit_profile)
{
unit *u = get_visible_unit();
@ -743,12 +741,11 @@ REPORT_GENERATOR(unit_profile)
return image_report(u->small_profile());
}
REPORT_GENERATOR(time_of_day)
static config time_of_day_at(map_location& mouseover_hex)
{
std::ostringstream tooltip;
time_of_day tod;
const team &viewing_team = (*resources::teams)[resources::screen->viewing_team()];
map_location mouseover_hex = resources::screen->mouseover_hex();
if (viewing_team.shrouded(mouseover_hex)) {
// Don't show time on shrouded tiles.
tod = resources::tod_manager->get_time_of_day();
@ -774,6 +771,16 @@ REPORT_GENERATOR(time_of_day)
return image_report(tod_image, tooltip.str(), "time_of_day");
}
REPORT_GENERATOR(time_of_day)
{
map_location mouseover_hex = resources::screen->mouseover_hex();
return time_of_day_at(mouseover_hex);
}
REPORT_GENERATOR(selected_time_of_day)
{
map_location selected_hex = resources::screen->selected_hex();
return time_of_day_at(selected_hex);
}
REPORT_GENERATOR(turn)
{