aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-09-21 11:24:01 -0300
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-09-21 11:24:01 -0300
commit8244a8254089dd83c0f6f338bdcc68c9e52dc069 (patch)
treead68be86e617bf4509b438a03117687f57547ee1 /src
parent601f5e768cb37194bcfb042f41b3f254f54a152a (diff)
Set the scale and window name when switching to a camera
Different cameras may have different scales and names. Set it when switching between cameras. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'src')
-rw-r--r--src/callbacks.c4
-rw-r--r--src/camorama-window.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/callbacks.c b/src/callbacks.c
index a1a62a6..1191ddc 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -1185,6 +1185,8 @@ void start_camera(cam_t *cam)
print_cam(cam);
/* Add resolutions */
-
add_gtk_view_resolutions(cam);
+
+ /* Adjust image scale */
+ set_image_scale(cam);
}
diff --git a/src/camorama-window.c b/src/camorama-window.c
index 152a236..2a28fae 100644
--- a/src/camorama-window.c
+++ b/src/camorama-window.c
@@ -496,6 +496,4 @@ void load_interface(cam_t *cam)
set_sensitive(cam);
gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(cam->xml, "string_entry")),
cam->usestring);
-
- set_image_scale(cam);
}

Privacy Policy