From 0ce76f2c231119cb6688bd8318911c80bfbcdf92 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 14 Nov 2025 10:01:31 +0600 Subject: [PATCH] Added scroll block for main window combo boxes --- source/ubl-settings-keyboard.c | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/source/ubl-settings-keyboard.c b/source/ubl-settings-keyboard.c index 60c78f3..dd93377 100644 --- a/source/ubl-settings-keyboard.c +++ b/source/ubl-settings-keyboard.c @@ -44,25 +44,6 @@ gboolean yon_interface_update(main_window *widgets){ yon_char_parsed_free(parsed,parsed_size); } } - - // char *tty_keymap = config(console_keymap_parameter); - // if (!yon_char_is_empty(tty_keymap)){ - // gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->TTYLayoutCombo),tty_keymap); - // } else { - // gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->TTYLayoutCombo),0); - // } - // char *tty_keymap_change = config(console_keymap_toggle_parameter); - // if (!yon_char_is_empty(tty_keymap_change)){ - // gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->TTYKeymapCombo),tty_keymap_change); - // } else { - // gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->TTYKeymapCombo),0); - // } - // char *tty_font = config(console_font_parameter); - // if (!yon_char_is_empty(tty_font)){ - // gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->TTYFontCombo),tty_font); - // } else { - // gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->TTYFontCombo),0); - // } } { gtk_list_store_clear(widgets->OptionsList); @@ -113,21 +94,21 @@ gboolean yon_interface_update(main_window *widgets){ if (!yon_char_is_empty(tty_layout)){ gtk_entry_set_text(GTK_ENTRY(widgets->TTYLayoutEntry),tty_layout); } else { - gtk_entry_set_text(GTK_ENTRY(widgets->TTYLayoutEntry),""); + gtk_entry_set_text(GTK_ENTRY(widgets->TTYLayoutEntry),yon_char_get_localised_from_lib(DEFAULT_LABEL)); } char *tty_keymap = config(console_keymap_toggle_parameter); if (!yon_char_is_empty(tty_keymap)){ gtk_entry_set_text(GTK_ENTRY(widgets->TTYSecondLayoutEntry),tty_keymap); } else { - gtk_entry_set_text(GTK_ENTRY(widgets->TTYSecondLayoutEntry),""); + gtk_entry_set_text(GTK_ENTRY(widgets->TTYSecondLayoutEntry),yon_char_get_localised_from_lib(DEFAULT_LABEL)); } char *tty_font = config(console_font_parameter); if (!yon_char_is_empty(tty_font)){ gtk_entry_set_text(GTK_ENTRY(widgets->TTYFontEntry),tty_font); } else { - gtk_entry_set_text(GTK_ENTRY(widgets->TTYFontEntry),""); + gtk_entry_set_text(GTK_ENTRY(widgets->TTYFontEntry),yon_char_get_localised_from_lib(DEFAULT_LABEL)); } } @@ -392,6 +373,10 @@ void yon_main_window_complete(main_window *widgets){ g_signal_connect(G_OBJECT(widgets->SaveLocalMenuItem),"activate",G_CALLBACK(on_config_local_save),widgets); g_signal_connect(G_OBJECT(widgets->SaveGlobalMenuItem),"activate",G_CALLBACK(on_config_global_save),widgets); g_signal_connect(G_OBJECT(widgets->SaveCustomMenuItem),"activate",G_CALLBACK(on_config_custom_save),widgets); + yon_gtk_combo_box_block_scroll(GTK_COMBO_BOX(widgets->NumLockCombo)); + yon_gtk_combo_box_block_scroll(GTK_COMBO_BOX(widgets->KeyboardModelCombo)); + yon_gtk_combo_box_block_scroll(GTK_COMBO_BOX(widgets->LayoutChangingCombo)); + } int size;