Fix

torikulhabib · Apr 1, 2020 · ef59faf · ef59faf
1 parent 55bbaff
commit ef59faf
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 19 deletions.
diff --git a/data/com.github.torikulhabib.niki.appdata.xml.in b/data/com.github.torikulhabib.niki.appdata.xml.in
@@ -31,7 +31,7 @@
     <binary>com.github.torikulhabib.niki</binary>
   </provides>
   <releases>
-    <release version="0.7.33" date="2020-3-20">
+    <release version="0.7.34" date="2020-3-20">
       <description>
         <p>Fix and add Features!</p>
         <p>Lyric Maker!</p>

diff --git a/src/CircularGrid.vala b/src/CircularGrid.vala
@@ -4,6 +4,7 @@ namespace niki {
 
         construct {
             circularprogressbar = new CircularProgressBar ();
+            circularprogressbar.radius_filled = true;
             valign = Gtk.Align.CENTER;
             halign = Gtk.Align.CENTER;
             add (circularprogressbar);

diff --git a/src/ClutterGstreamer.vala b/src/ClutterGstreamer.vala
@@ -33,6 +33,7 @@ namespace niki {
             audiomix = new AudioMix ();
             pipeline = get_pipeline ();
             pipeline["video-sink"] = videomix;
+            pipeline["audio-sink"] = audiomix;
             var iter = ((Gst.Bin)pipeline).iterate_sinks ();
             Value value;
             while (iter.next (out value) == Gst.Iterator.OK) {
@@ -43,7 +44,6 @@ namespace niki {
                     break;
                 }
             }
-            playsink["audio-sink"] = audiomix;
             Gst.Bus bus = ((Gst.Pipeline)pipeline).get_bus ();
             bus.add_signal_watch ();
             bus.message.connect (handle_message);

diff --git a/src/PlayerPage.vala b/src/PlayerPage.vala
@@ -367,12 +367,11 @@ namespace niki {
             NikiApp.window.main_stack.visible_child_name = "welcome";
         }
         public void scroll_actor (int index_in) {
-            Clutter.Actor item;
             Clutter.Actor menu = scroll.get_first_child ();
             if (index_in > 0) {
                 seek_music ();
             }
-            item = menu.get_child_at_index (index_in);
+            Clutter.Actor item = menu.get_child_at_index (index_in);
             item.get_position (out point.x, out point.y);
             point.y = point.y - ((menu_actor.height / 2) - (((Clutter.Text)item).height / 2));
             scroll.save_easing_state ();

diff --git a/src/StringPot.vala b/src/StringPot.vala
@@ -263,7 +263,7 @@ namespace niki {
         public abstract const string Control_Keys               = _("Control Keys");
         public abstract const string Video_Crop                 = _("Video Crop");
         public abstract const string Choose_Crop                = _("Choose the part of the video to crop.");
-        public abstract const string Set_Crop                   = _("Set Crop.");
+        public abstract const string Set_Crop                   = _("Set Crop");
         public abstract const string Top                        = _("Top :");
         public abstract const string Bottom                     = _("Bottom :");
         public abstract const string Left                       = _("Left :");

diff --git a/src/TopBar.vala b/src/TopBar.vala
@@ -46,8 +46,6 @@ namespace niki {
                         Source.remove (hiding_timer);
                         hiding_timer = 0;
                     }
-                } else {
-                    reveal_control ();
                 }
             }
         }
@@ -75,18 +73,11 @@ namespace niki {
                 }
                 return false;
             });
-            button_press_event.connect (() => {
-                hovered = true;
-                return Gdk.EVENT_PROPAGATE;
-            });
 
-            button_release_event.connect (() => {
-                hovered = true;
-                return false;
-            });
             leave_notify_event.connect ((event) => {
               if (NikiApp.window.is_active) {
                     if (event.window == get_window ()) {
+                        reveal_control ();
                         hovered = false;
                     }
                 }
@@ -140,6 +131,12 @@ namespace niki {
             crop_button.clicked.connect (() => {
                 var videocrop = new VideoCrop (playerpage);
                 videocrop.show_all ();
+                set_reveal_child (false);
+            });
+            notify["child-revealed"].connect (() => {
+                if (!child_revealed) {
+                    hovered = child_revealed;
+                }
             });
             my_app = new Gtk.Label (null);
             my_app.get_style_context ().add_class ("button_action");

diff --git a/src/VideoCrop.vala b/src/VideoCrop.vala
@@ -60,10 +60,10 @@ namespace niki {
             button_change.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION);
             response.connect ((source, response_id)=>{
                 if (response_id == Gtk.ResponseType.OK) {
-                    int top_value = (int) top_label.number_entry.value > 1000? 1000 : (int) top_label.number_entry.value;
-                    int bottom_value = (int) bottom_label.number_entry.value;
-                    int left_value = (int) left_label.number_entry.value;
-                    int right_value = (int) right_label.number_entry.value;
+                    int top_value = (int) top_label.number_entry.get_value ();
+                    int bottom_value = (int) bottom_label.number_entry.get_value ();
+                    int left_value = (int) left_label.number_entry.get_value ();
+                    int right_value = (int) right_label.number_entry.get_value ();
                     NikiApp.window.player_page.playback.videomix.set_videocrp (top_value, bottom_value, left_value, right_value);
                 } else if (response_id == Gtk.ResponseType.CLOSE) {
                     destroy ();