Fixed SL#3360, Stopped the shutter button 'moving' when you started recording a video/audio

2 files changed, 11 insertions, 5 deletions

diff --git a/mediaview.py b/mediaview.py
index 01567ff..8dbcabc 100644
--- a/mediaview.py
+++ b/mediaview.py
@@ -177,7 +177,6 @@ class FullscreenButton(gtk.EventBox):
     def set_reduce(self):
         self._image.set_from_pixbuf(self._reduce_pixbuf)
 
-
 class InfoButton(gtk.EventBox):
     def __init__(self):
         super(InfoButton, self).__init__()
@@ -442,6 +441,8 @@ class MediaView(gtk.EventBox):
     def _video_clicked(self, widget, event):
         if self._mode != MediaView.MODE_LIVE:
             self.emit('pip-clicked')
+        else:
+            self.emit('media-clicked')
 
     def _video2_clicked(self, widget, event):
         self.emit('media-clicked')
diff --git a/record.py b/record.py
index e25010e..7a2c30c 100644
--- a/record.py
+++ b/record.py
@@ -196,13 +196,16 @@ class Record(activity.Activity):
 
         self._controls_hbox = gtk.HBox()
         self._controls_hbox.show()
-
+        
+        a = gtk.Alignment(0, 0, 1, 1)
         self._shutter_button = ShutterButton()
         self._shutter_button.connect("clicked", self._shutter_clicked)
-        self._controls_hbox.pack_start(self._shutter_button, expand=True, fill=False)
+        a.add(self._shutter_button)
+        self._controls_hbox.pack_start(a, expand=False, fill=True)
+        a.show()
 
         self._countdown_image = CountdownImage()
-        self._controls_hbox.pack_start(self._countdown_image, expand=True, fill=False)
+        self._controls_hbox.pack_start(self._countdown_image, expand=False, fill=True)
 
         self._play_button = PlayButton()
         self._play_button.connect('clicked', self._play_pause_clicked)
@@ -314,6 +317,8 @@ class Record(activity.Activity):
     def _media_view_media_clicked(self, widget):
         if self._play_button.props.visible and self._play_button.props.sensitive:
             self._play_button.clicked()
+        else:
+            self.model.do_shutter()
 
     def _media_view_pip_clicked(self, widget):
         # clicking on the PIP always returns to live mode
@@ -334,7 +339,7 @@ class Record(activity.Activity):
         self._showing_info = True
         if self.model.get_mode() in (constants.MODE_PHOTO, constants.MODE_AUDIO):
             func = self._media_view.show_info_photo
-        else:
+        if self._shutter_button.get_sensitive():
             func = self._media_view.show_info_video
 
         self._play_button.hide()