From baeacac20195066b82a4d258e61d02a739239014 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 26 Dec 2023 16:10:04 +0600 Subject: [PATCH 1/3] Added new function for setting minimal column width --- source/libublsettings-gtk3.c | 14 +++++++++++++- source/libublsettings-gtk3.h | 6 +++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/source/libublsettings-gtk3.c b/source/libublsettings-gtk3.c index 3dbe72b..31099dd 100644 --- a/source/libublsettings-gtk3.c +++ b/source/libublsettings-gtk3.c @@ -487,11 +487,23 @@ int yon_gtk_combo_box_text_find(GtkWidget *combo_box, char *text_to_find){ } return -1; } -void yon_gtk_column_minimal_fixed_size_set(GtkTreeViewColumn *column){ +void _yon_gtk_column_minimal_fixed_size_set(GtkTreeViewColumn *column){ int width= gtk_tree_view_column_get_width(column); gtk_tree_view_column_set_min_width(column,width); } +void _yon_gtk_tree_view_minimal_fixed_size_set_full(GtkTreeView *tree){ + sleep(1); + GList *list = gtk_tree_view_get_columns(tree); + for (int i=0;i Date: Tue, 26 Dec 2023 17:05:08 +0600 Subject: [PATCH 2/3] Function for setting minimal column width were edited --- source/libublsettings-gtk3.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/source/libublsettings-gtk3.c b/source/libublsettings-gtk3.c index 31099dd..30b1934 100644 --- a/source/libublsettings-gtk3.c +++ b/source/libublsettings-gtk3.c @@ -488,12 +488,24 @@ int yon_gtk_combo_box_text_find(GtkWidget *combo_box, char *text_to_find){ } void _yon_gtk_column_minimal_fixed_size_set(GtkTreeViewColumn *column){ - int width= gtk_tree_view_column_get_width(column); - gtk_tree_view_column_set_min_width(column,width); + const gchar *title = gtk_tree_view_column_get_title(column); + GtkWidget *label = gtk_label_new(title); + int header_width = 0; + PangoLayout *layout = gtk_widget_create_pango_layout(label, title); + + if (layout != NULL) { + pango_layout_get_pixel_size(layout, &header_width, NULL); + g_object_unref(layout); + } + if (GTK_IS_WIDGET(label)) { + g_object_ref_sink(label); + } + + gtk_tree_view_column_set_min_width(column, header_width); + g_object_unref(label); } void _yon_gtk_tree_view_minimal_fixed_size_set_full(GtkTreeView *tree){ - sleep(1); GList *list = gtk_tree_view_get_columns(tree); for (int i=0;i Date: Thu, 28 Dec 2023 12:40:00 +0600 Subject: [PATCH 3/3] Fixed version pasting and cleaning --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5dcc296..18c35c1 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ init: else \ LATEST_TAG="Development"; \ fi; \ - sed -r "s/^(project\(${PRJNAME} VERSION ).*/\1$${LATEST_TAG}\)/" -i ${FILE_VER}; \ + sed -r "s/^(project\(${PKGNAME} VERSION ).*/\1$${LATEST_TAG}\)/" -i ${FILE_VER}; \ echo "-- Build path: ${CMAKE_UTILS_BUILD_DIR}" depend: @@ -98,6 +98,7 @@ install: check clean: @echo "Clean ..." + @sed -r "s/^(project\(${PKGNAME} VERSION ).*/\10\)/" -i ${FILE_VER} @$(RM) -rd ${CMAKE_UTILS_BUILD_DIR} @$(RM) -rd ${CMAKE_UTILS_BUILD_DIR} @if [ -d ${CMAKE_UTILS_BUILD_DIR} ]; then \