Commit Diff


commit - 518b125835bf3dfd068189334ffb193142de82bf
commit + 2e179df643e72bfa73d8c6f4334b6f5e5ea1900b
blob - 30f4d10fc468f13a572aaf08e5f8d59c8474007f
blob + 879a6cdebb1909138f0656c4a71ad02948f2c1fe
--- ctlitem.c
+++ ctlitem.c
@@ -174,9 +174,8 @@ siomixer_ctl_item_to_widget(gpointer o, gpointer user_
 	if (strlen(item->desc.group))
 		asprintf(&group, "%s/", item->desc.group);
 	if (item->desc.node0.unit >= 0)
-		asprintf(&unit, "[%d]", item->desc.node0.unit);
-	asprintf(&label, "%s%s.%s%s", group ? group : "", item->desc.node0.name,
-	    item->desc.func, unit ? unit : "");
+		asprintf(&unit, "/%d", item->desc.node0.unit);
+	asprintf(&label, "%s%s%s", group ? group : "", item->desc.node0.name, unit ? unit : "");
 
 	GtkWidget *l = gtk_label_new(label);
 	gtk_widget_set_vexpand(l, FALSE);
@@ -184,10 +183,10 @@ siomixer_ctl_item_to_widget(gpointer o, gpointer user_
 
 	GtkWidget *gscale = gtk_scale_new_with_range(GTK_ORIENTATION_VERTICAL, 0, item->desc.maxval, 1);
 	gtk_range_set_inverted(GTK_RANGE(gscale), TRUE);
-	gtk_widget_set_vexpand(gscale, TRUE);
 	gtk_scale_set_draw_value(GTK_SCALE(gscale), TRUE);
 	gtk_scale_set_format_value_func(GTK_SCALE(gscale), _format_percent, NULL, NULL);
-	gtk_widget_set_size_request(gscale, -1, 150);
+	gtk_widget_set_vexpand(gscale, TRUE);
+	gtk_widget_set_size_request(gscale, -1, 200);
 
 	g_signal_connect(item, "notify::level", G_CALLBACK(_on_scale_value_changed), item);
 	GtkAdjustment *a = gtk_range_get_adjustment(GTK_RANGE(gscale)); 
blob - c7adf557a74cccb9218581c748d7f8a7aa2b5584
blob + b3b2290778726547446328f35f5330f5f3013729
--- siomixer.c
+++ siomixer.c
@@ -64,8 +64,10 @@ ondesc(void *arg, struct sioctl_desc *d, int curval)
 	gint i, n_items, cmp = -1;
 	SiomixerCtlItem *item = NULL;
 
-	if (d == NULL)
+	if (d == NULL) {
+		printf("NULL/\n");
 		return;
+	}
 
 	n_items = g_list_model_get_n_items(G_LIST_MODEL(s.controls));
 	for (i = n_items - 1; i >= 0; i--) {
@@ -277,7 +279,6 @@ activate (GtkApplication *app, gpointer user_data)
 
 	window = gtk_application_window_new (app);
 	gtk_window_set_title(GTK_WINDOW (window), "Mixer");
-	gtk_window_set_default_size(GTK_WINDOW (window), 500, 300);
 
 	dropdown = build_dropdown();
 
@@ -299,9 +300,10 @@ activate (GtkApplication *app, gpointer user_data)
 	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
 	gtk_box_append(GTK_BOX(vbox), dropdown);
 	gtk_box_append(GTK_BOX(vbox), scroll);
-	gtk_widget_set_size_request(vbox, 500, 300);
-
+	gtk_widget_set_size_request(vbox, 500, 400);
 	gtk_window_set_child(GTK_WINDOW(window), vbox);
+
+	gtk_window_set_default_size(GTK_WINDOW (window), -1, -1);
 	gtk_window_present(GTK_WINDOW (window));
 }