master #6

Merged
asmeron merged 3 commits from YanTheKaller/libublsettings-gtk3:master into master 2 years ago

@ -32,7 +32,7 @@ init:
else \ else \
LATEST_TAG="Development"; \ LATEST_TAG="Development"; \
fi; \ 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}" echo "-- Build path: ${CMAKE_UTILS_BUILD_DIR}"
depend: depend:
@ -98,6 +98,7 @@ install: check
clean: clean:
@echo "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}
@$(RM) -rd ${CMAKE_UTILS_BUILD_DIR} @$(RM) -rd ${CMAKE_UTILS_BUILD_DIR}
@if [ -d ${CMAKE_UTILS_BUILD_DIR} ]; then \ @if [ -d ${CMAKE_UTILS_BUILD_DIR} ]; then \

@ -487,9 +487,33 @@ int yon_gtk_combo_box_text_find(GtkWidget *combo_box, char *text_to_find){
} return -1; } 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); const gchar *title = gtk_tree_view_column_get_title(column);
gtk_tree_view_column_set_min_width(column,width); 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){
GList *list = gtk_tree_view_get_columns(tree);
for (int i=0;i<g_list_length(list);i++){
_yon_gtk_column_minimal_fixed_size_set((GtkTreeViewColumn*)g_list_nth_data(list,i));
}
}
void yon_gtk_tree_view_minimal_fixed_size_set_full(GtkTreeView *tree){
GThread *thread = g_thread_new("column",(GThreadFunc)_yon_gtk_tree_view_minimal_fixed_size_set_full,tree);
} }
int yon_dictionary_gtk_pack_start_multiple_widgets(GtkBox *destination, gboolean expand, gboolean fill, int padding, ...){ int yon_dictionary_gtk_pack_start_multiple_widgets(GtkBox *destination, gboolean expand, gboolean fill, int padding, ...){

@ -180,13 +180,13 @@ int yon_gtk_combo_box_fill(GtkWidget *combo, char **parameters,int size);
*/ */
int yon_gtk_combo_box_text_find(GtkWidget *combo_box, char *text_to_find); int yon_gtk_combo_box_text_find(GtkWidget *combo_box, char *text_to_find);
/**yon_gtk_column_minimal_fixed_size_set(GtkTreeViewColumn *column) /**yon_gtk_tree_view_minimal_fixed_size_set_full(GtkTreeView *tree)
* [EN] * [EN]
* *
* [RU] * [RU]
* Установить минимальный размер колонки [column] равным размеру заголовка. * Установить минимальный размер таблицы [tree] равным размеру заголовка.
*/ */
void yon_gtk_column_minimal_fixed_size_set(GtkTreeViewColumn *column); void yon_gtk_tree_view_minimal_fixed_size_set_full(GtkTreeView *tree);
/**yon_dictionary_gtk_pack_start_multiple_widgets(GtkBox *destination, gboolean expand, gboolean fill, int padding, ...) /**yon_dictionary_gtk_pack_start_multiple_widgets(GtkBox *destination, gboolean expand, gboolean fill, int padding, ...)
* [EN] * [EN]

Loading…
Cancel
Save