From a0c84b9617093c0fa1a90b0a0653f34d91fe2c59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=28=C2=B4=E3=83=BB=CF=89=E3=83=BB=EF=BD=80=29?= Date: Thu, 21 Jan 2021 08:20:45 +0900 Subject: [PATCH] CHG: The display order of the year and month depends on the environment settings. --- gui/extend_edit.cc | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gui/extend_edit.cc b/gui/extend_edit.cc index 5e123234d..390f8116c 100644 --- a/gui/extend_edit.cc +++ b/gui/extend_edit.cc @@ -8,6 +8,7 @@ #include "../simworld.h" #include "../simevent.h" +#include "../dataobj/environment.h" #include "../dataobj/translator.h" #include "../descriptor/ground_desc.h" @@ -130,14 +131,22 @@ extend_edit_gui_t::extend_edit_gui_t(const char *name, player_t* player_) : bt_timeline_custom.add_listener(this); cont_timeline.add_component(&bt_timeline_custom, 4); - cont_timeline.new_component("Month"); + bool year_month_order = ( env_t::show_month == env_t::DATE_FMT_JAPANESE || env_t::show_month == env_t::DATE_FMT_JAPANESE_NO_SEASON ); + + if( !year_month_order ) { + cont_timeline.new_component("Month"); + cont_timeline.add_component(&ni_timeline_month); + } + cont_timeline.new_component("Year"); + cont_timeline.add_component(&ni_timeline_year); ni_timeline_month.init( (sint32)(welt->get_current_month()%12+1), 1, 12, 1, true ); ni_timeline_month.add_listener(this); - cont_timeline.add_component(&ni_timeline_month); - cont_timeline.new_component("Year"); + if( year_month_order ) { + cont_timeline.new_component("Month"); + cont_timeline.add_component(&ni_timeline_month); + } ni_timeline_year.init( (sint32)(welt->get_current_month()/12), 0, 2999, 1, false ); ni_timeline_year.add_listener(this); - cont_timeline.add_component(&ni_timeline_year); bt_obsolete.init( button_t::square_state, "Show obsolete"); bt_obsolete.add_listener(this);