Project

General

Profile

Download (5.2 KB)

Bug #1435 » 1435Main.patch

Dean Brown, 10/16/2025 05:22 AM

View differences:

client/gui-gtk-4.0/chatline.c
static gboolean il_lost_focus(GtkEventControllerFocus *controller,
gpointer data)
{
real_menus_update();
menus_toggle_unit_commands(TRUE);
menus_toggle_player_commands(TRUE);
return TRUE;
}
......
static gboolean il_gained_focus(GtkEventControllerFocus *controller,
gpointer data)
{
menus_disable_unit_commands();
menus_toggle_unit_commands(FALSE);
menus_toggle_player_commands(FALSE);
return TRUE;
}
client/gui-gtk-4.0/menu.c
}
/**********************************************************************//**
Disable all unit related commands.
Toggle enable/disable all unit related commands.
**************************************************************************/
void menus_disable_unit_commands(void)
void menus_toggle_unit_commands(bool enable)
{
menu_entry_group_set_sensitive(G_ACTION_MAP(gui_app()), MGROUP_UNIT, FALSE);
menu_entry_group_set_sensitive(G_ACTION_MAP(gui_app()),
MGROUP_UNIT, enable);
}
/**********************************************************************//**
Toggle enable/disable all player related commands.
**************************************************************************/
void menus_toggle_player_commands(bool enable)
{
menu_entry_group_set_sensitive(G_ACTION_MAP(gui_app()),
MGROUP_PLAYER, enable);
}
client/gui-gtk-4.0/menu.h
void enable_menus(bool enable);
void menus_set_initial_toggle_values(void);
void menus_disable_unit_commands(void);
void menus_toggle_unit_commands(bool enable);
void menus_toggle_player_commands(bool enable);
#endif /* FC__MENU_H */
client/gui-gtk-5.0/chatline.c
static gboolean il_lost_focus(GtkEventControllerFocus *controller,
gpointer data)
{
real_menus_update();
menus_toggle_unit_commands(TRUE);
menus_toggle_player_commands(TRUE);
return TRUE;
}
......
static gboolean il_gained_focus(GtkEventControllerFocus *controller,
gpointer data)
{
menus_disable_unit_commands();
menus_toggle_unit_commands(FALSE);
menus_toggle_player_commands(FALSE);
return TRUE;
}
client/gui-gtk-5.0/menu.c
}
/**********************************************************************//**
Disable all unit related commands.
Toggle enable/disable all unit related commands.
**************************************************************************/
void menus_disable_unit_commands(void)
void menus_toggle_unit_commands(bool enable)
{
menu_entry_group_set_sensitive(G_ACTION_MAP(gui_app()), MGROUP_UNIT, FALSE);
menu_entry_group_set_sensitive(G_ACTION_MAP(gui_app()),
MGROUP_UNIT, enable);
}
/**********************************************************************//**
Toggle enable/disable all player related commands.
**************************************************************************/
void menus_toggle_player_commands(bool enable)
{
menu_entry_group_set_sensitive(G_ACTION_MAP(gui_app()),
MGROUP_PLAYER, enable);
}
client/gui-gtk-5.0/menu.h
void enable_menus(bool enable);
void menus_set_initial_toggle_values(void);
void menus_disable_unit_commands(void);
void menus_toggle_unit_commands(bool enable);
void menus_toggle_player_commands(bool enable);
#endif /* FC__MENU_H */
(2-2/2)