From 6812c001dee061c38e167a455cf0299c1c390e9f Mon Sep 17 00:00:00 2001 From: "Geoffrey D. Bennett" Date: Sat, 2 Dec 2023 03:32:12 +1030 Subject: [PATCH] Fix long lines --- src/iface-mixer.c | 16 ++++++++++++---- src/main.c | 4 +++- src/routing-drag-line.c | 8 ++++++-- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/iface-mixer.c b/src/iface-mixer.c index 5f35d2e..e860f51 100644 --- a/src/iface-mixer.c +++ b/src/iface-mixer.c @@ -383,8 +383,12 @@ static GtkWidget *create_main_window_controls(struct alsa_card *card) { gtk_widget_set_margin(top, 10); gtk_grid_set_spacing(GTK_GRID(top), 10); - int input_count = get_max_elem_by_name(card->elems, "Line", "Capture Switch"); - int output_count = get_max_elem_by_name(card->elems, "Line", "Playback Volume"); + int input_count = get_max_elem_by_name( + card->elems, "Line", "Capture Switch" + ); + int output_count = get_max_elem_by_name( + card->elems, "Line", "Playback Volume" + ); create_global_controls(card, top, &x); create_input_controls(card, top, &x); @@ -440,8 +444,12 @@ static void create_scrollable_window(GtkWidget *window, GtkWidget *controls) { gtk_scrolled_window_set_child( GTK_SCROLLED_WINDOW(scrolled_window), controls ); - gtk_scrolled_window_set_propagate_natural_height(GTK_SCROLLED_WINDOW(scrolled_window), TRUE); - gtk_scrolled_window_set_propagate_natural_width(GTK_SCROLLED_WINDOW(scrolled_window), TRUE); + gtk_scrolled_window_set_propagate_natural_height( + GTK_SCROLLED_WINDOW(scrolled_window), TRUE + ); + gtk_scrolled_window_set_propagate_natural_width( + GTK_SCROLLED_WINDOW(scrolled_window), TRUE + ); gtk_window_set_child(GTK_WINDOW(window), scrolled_window); gtk_window_set_resizable(GTK_WINDOW(window), TRUE); diff --git a/src/main.c b/src/main.c index c206dd1..5ddc6f1 100644 --- a/src/main.c +++ b/src/main.c @@ -63,7 +63,9 @@ static void open_cb( } int main(int argc, char **argv) { - app = gtk_application_new("vu.b4.alsa-scarlett-gui", G_APPLICATION_HANDLES_OPEN); + app = gtk_application_new( + "vu.b4.alsa-scarlett-gui", G_APPLICATION_HANDLES_OPEN + ); g_signal_connect(app, "startup", G_CALLBACK(startup), NULL); g_signal_connect(app, "activate", G_CALLBACK(activate), NULL); g_signal_connect(app, "open", G_CALLBACK(open_cb), NULL); diff --git a/src/routing-drag-line.c b/src/routing-drag-line.c index 91020fd..e6cb54c 100644 --- a/src/routing-drag-line.c +++ b/src/routing-drag-line.c @@ -57,8 +57,12 @@ static void drag_motion( gtk_adjustment_get_page_size(vadj); // Determine the relative size of the scrollable area - double rel_w = gtk_adjustment_get_upper(hadj) - gtk_widget_get_allocated_width(GTK_WIDGET(sw)) + gtk_widget_get_allocated_width(child); - double rel_h = gtk_adjustment_get_upper(vadj) - gtk_widget_get_allocated_height(GTK_WIDGET(sw)) + gtk_widget_get_allocated_height(child); + double rel_w = gtk_adjustment_get_upper(hadj) - + gtk_widget_get_allocated_width(GTK_WIDGET(sw)) + + gtk_widget_get_allocated_width(child); + double rel_h = gtk_adjustment_get_upper(vadj) - + gtk_widget_get_allocated_height(GTK_WIDGET(sw)) + + gtk_widget_get_allocated_height(child); // Add margin rel_w -= 100;