Fix long lines

This commit is contained in:
Geoffrey D. Bennett
2023-12-02 03:32:12 +10:30
parent 266b90e8ce
commit 6812c001de
3 changed files with 21 additions and 7 deletions

View File

@@ -383,8 +383,12 @@ static GtkWidget *create_main_window_controls(struct alsa_card *card) {
gtk_widget_set_margin(top, 10); gtk_widget_set_margin(top, 10);
gtk_grid_set_spacing(GTK_GRID(top), 10); gtk_grid_set_spacing(GTK_GRID(top), 10);
int input_count = get_max_elem_by_name(card->elems, "Line", "Capture Switch"); int input_count = get_max_elem_by_name(
int output_count = get_max_elem_by_name(card->elems, "Line", "Playback Volume"); 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_global_controls(card, top, &x);
create_input_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_set_child(
GTK_SCROLLED_WINDOW(scrolled_window), controls 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_height(
gtk_scrolled_window_set_propagate_natural_width(GTK_SCROLLED_WINDOW(scrolled_window), TRUE); 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_child(GTK_WINDOW(window), scrolled_window);
gtk_window_set_resizable(GTK_WINDOW(window), TRUE); gtk_window_set_resizable(GTK_WINDOW(window), TRUE);

View File

@@ -63,7 +63,9 @@ static void open_cb(
} }
int main(int argc, char **argv) { 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, "startup", G_CALLBACK(startup), NULL);
g_signal_connect(app, "activate", G_CALLBACK(activate), NULL); g_signal_connect(app, "activate", G_CALLBACK(activate), NULL);
g_signal_connect(app, "open", G_CALLBACK(open_cb), NULL); g_signal_connect(app, "open", G_CALLBACK(open_cb), NULL);

View File

@@ -57,8 +57,12 @@ static void drag_motion(
gtk_adjustment_get_page_size(vadj); gtk_adjustment_get_page_size(vadj);
// Determine the relative size of the scrollable area // 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_w = gtk_adjustment_get_upper(hadj) -
double rel_h = gtk_adjustment_get_upper(vadj) - gtk_widget_get_allocated_height(GTK_WIDGET(sw)) + gtk_widget_get_allocated_height(child); 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 // Add margin
rel_w -= 100; rel_w -= 100;