diff options
| author | Takamichi Horikawa <takamichiho@gmail.com> | 2017-04-03 22:21:50 +0900 |
|---|---|---|
| committer | Takamichi Horikawa <takamichiho@gmail.com> | 2017-04-03 22:21:50 +0900 |
| commit | e897b22bddec9bd93a228346d3f0ec615bb93d7a (patch) | |
| tree | 34272dfbaad18dbb38521924d6ed6d5cae5253a0 | |
| parent | 13fa1c98aff7ec24d661672f830d016c1a523b8f (diff) | |
gtk: oscilloview resize
| -rw-r--r-- | gtk/oscilloview.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk/oscilloview.c b/gtk/oscilloview.c index 724ada9..bf56140 100644 --- a/gtk/oscilloview.c +++ b/gtk/oscilloview.c @@ -42,6 +42,8 @@ static gboolean draw_cb(GtkWidget *w, gpointer ptr) { (void)w; (void)ptr; + guint width = gtk_widget_get_allocated_width(w) / 3u; + guint height = gtk_widget_get_allocated_height(w) / 3u; cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE); if (!atomic_flag_test_and_set_explicit( &oscilloview_g.flag, memory_order_acquire)) { @@ -55,7 +57,7 @@ static gboolean draw_cb(GtkWidget *w, cairo_set_source_rgb(cr, 1.0, 1.0, 1.0); for (int x = 0; x < 3; x++) { for (int y = 0; y < 3; y++) { - draw_track(cr, x*WIDTH, y*HEIGHT, WIDTH, HEIGHT, &g.oscillodata[x*3+y]); + draw_track(cr, x*width, y*height, width, height, &g.oscillodata[x*3+y]); } } return FALSE; @@ -76,7 +78,7 @@ void show_oscilloview(void) { } GtkWidget *drawarea = gtk_drawing_area_new(); gtk_container_add(GTK_CONTAINER(g.win), drawarea); - gtk_widget_set_size_request(drawarea, WIDTH*3, HEIGHT*3); + //gtk_widget_set_size_request(drawarea, WIDTH*3, HEIGHT*3); g_signal_connect(drawarea, "draw", G_CALLBACK(draw_cb), 0); gtk_widget_add_tick_callback(drawarea, tick_cb, 0, 0); gtk_widget_show_all(g.win); |