[Xfce4-commits] [apps/parole] 01/01: Always show playcontrols if hide-controls-timeout is set to 0 (Bug #10976) They will be hidden when in fullscreen mode after the default of 4 seconds

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

ochosi pushed a commit to branch master
in repository apps/parole.

commit fe1aacce326414b51a642a9aedc5985035191106
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Sun Jun 29 01:55:41 2014 +0200

    Always show playcontrols if hide-controls-timeout is set to 0 (Bug #10976)
    They will be hidden when in fullscreen mode after the default of 4 seconds
---
 src/parole-player.c |   26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/parole-player.c b/src/parole-player.c
index 5576e3e..3d3c6c1 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1459,7 +1459,13 @@ parole_player_playing (ParolePlayer *player, const ParoleStream *stream)
     g_object_get (G_OBJECT (player->priv->conf),
                   "hide-controls-timeout", &hide_controls_timeout,
                   NULL);
-    g_timeout_add_seconds (hide_controls_timeout, (GSourceFunc) parole_player_hide_controls, player);
+    if (hide_controls_timeout != 0 || player->priv->full_screen)
+    {
+        if (player->priv->full_screen)
+            g_timeout_add_seconds (4, (GSourceFunc) parole_player_hide_controls, player);
+        else
+            g_timeout_add_seconds (hide_controls_timeout, (GSourceFunc) parole_player_hide_controls, player);
+    }
 }
 
 static void
@@ -2244,8 +2250,15 @@ parole_player_gst_widget_motion_notify_event (GtkWidget *widget, GdkEventMotion
                               "hide-controls-timeout", &hide_controls_timeout,
                               NULL);
 
-                hide_timeout = g_timeout_add_seconds (hide_controls_timeout,
+                if (hide_controls_timeout != 0 || player->priv->full_screen)
+                {
+                    if (player->priv->full_screen)
+                        hide_timeout = g_timeout_add_seconds (4,
+                                                      (GSourceFunc) parole_player_hide_controls, player);
+                    else
+                        hide_timeout = g_timeout_add_seconds (hide_controls_timeout,
                                                       (GSourceFunc) parole_player_hide_controls, player);
+                }
             }
         }
     }
@@ -2260,8 +2273,15 @@ parole_player_gst_widget_motion_notify_event (GtkWidget *widget, GdkEventMotion
                       "hide-controls-timeout", &hide_controls_timeout,
                       NULL);
 
-        hide_timeout = g_timeout_add_seconds (hide_controls_timeout,
+        if (hide_controls_timeout != 0 || player->priv->full_screen)
+        {
+            if (player->priv->full_screen)
+                hide_timeout = g_timeout_add_seconds (4,
                                               (GSourceFunc) parole_player_hide_controls, player);
+            else
+                hide_timeout = g_timeout_add_seconds (hide_controls_timeout,
+                                              (GSourceFunc) parole_player_hide_controls, player);
+        }
     }
 #endif
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.