Probably done. It is tested in simple way. Implementation is very similar to GTK3, but makes thinks compiles without warnings/errors and other minor changes was made.
- Separate patch is needed for S3_2. This didn't apply there.
- I created a new version of main patch where the same change is applied also to client/gui-gtk-5.0
Reply To cazfi
- Separate patch is needed for S3_2. This didn't apply there. - I created a new version of main patch where the same change is applied also to client/gui-gtk-5.0
0001-OSDN-117691-Slawomir-Lach-nintyfan19-gmail.com.patch(7KB)
Comparing your main branch patch to S3_2 one, there's a couple of suspicious differences:
city_dialog_update_building(pdialog);
- city_dialog_update_improvement_list(pdialog);
- city_dialog_update_supported_units(pdialog);
- city_dialog_update_present_units(pdialog);
-+ city_dialog_update_counters(pdialog);
-
- if (!client_has_player() || city_owner(pcity) == client_player()) {
- bool have_present_units = (unit_list_size(pcity->tile->units) > 0);
N_("Overview page"),
N_("Production page"),
-+ N_("Counters Page"),
N_("Happiness page"),
++ N_("Counters Page"),
N_("Governor page"),
N_("This Settings page"),
Reply To cazfi
Comparing your main branch patch to S3_2 one, there's a couple of suspicious differences: {{{ city_dialog_update_building(pdialog); - city_dialog_update_improvement_list(pdialog); - city_dialog_update_supported_units(pdialog); - city_dialog_update_present_units(pdialog); -+ city_dialog_update_counters(pdialog); - - if (!client_has_player() || city_owner(pcity) == client_player()) { - bool have_present_units = (unit_list_size(pcity->tile->units) > 0); }}} {{{ N_("Overview page"), N_("Production page"), -+ N_("Counters Page"), N_("Happiness page"), ++ N_("Counters Page"), N_("Governor page"), N_("This Settings page"), }}}
gtk4x-client (gui-gtk-5.0) part missing from the new main branch version.
Likely you can just use 'patch' with appropriate -p (i.e. '-p3') to apply current patch to client/gui-gtk-5.0, and then combine the result with the gtk4-client part.
I've got from client: ** Gsk:ERROR:../gsk/gl/gskglcommandqueue.c:599:gsk_gl_command_queue_begin_draw: assertion failed: (height <= G_MAXUINT16) Bail out! Gsk:ERROR:../gsk/gl/gskglcommandqueue.c:599:gsk_gl_command_queue_begin_draw: assertion failed: (height <= G_MAXUINT16)
Put entire log somewhere?
I do not commit changes made by patch, do stash, build again and the same error.
Reply To cazfi
gtk4x-client (gui-gtk-5.0) part missing from the new main branch version. Likely you can just use 'patch' with appropriate -p (i.e. '-p3') to apply current patch to client/gui-gtk-5.0, and then combine the result with the gtk4-client part.
I did just that. Full patch attached.
Related to: https://osdn.net/projects/freeciv/ticket/47887 . This ticket is similar to above, but addressed to implement counters' tab in city dialog for GTK+-4 client.