Some styling tweaks

4 files changed, 32 insertions, 21 deletions

diff --git a/share/ui/dialog-livepatheffect-add-effect.ui b/share/ui/dialog-livepatheffect-add-effect.ui
index c51ad477f..350721499 100644
--- a/share/ui/dialog-livepatheffect-add-effect.ui
+++ b/share/ui/dialog-livepatheffect-add-effect.ui
@@ -118,7 +118,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkButtonBox">
+          <object class="GtkButtonBox" id="LPESelectorButtonBox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">center</property>
@@ -139,7 +139,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
                     <property name="valign">start</property>
-                    <property name="pixel_size">20</property>
+                    <property name="pixel_size">23</property>
                     <property name="icon_name">infopop-outline</property>
                     <property name="icon_size">2</property>
                     <style>
@@ -170,7 +170,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">center</property>
                     <property name="valign">start</property>
-                    <property name="pixel_size">20</property>
+                    <property name="pixel_size">23</property>
                     <property name="icon_name">draw-star-outline</property>
                     <property name="icon_size">2</property>
                     <style>
@@ -200,7 +200,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="valign">start</property>
-                    <property name="pixel_size">20</property>
+                    <property name="pixel_size">23</property>
                     <property name="icon_name">on</property>
                     <property name="icon_size">2</property>
                     <style>
diff --git a/share/ui/dialog-livepatheffect-add.ui b/share/ui/dialog-livepatheffect-add.ui
index 2a695c8cf..2fb41ad76 100644
--- a/share/ui/dialog-livepatheffect-add.ui
+++ b/share/ui/dialog-livepatheffect-add.ui
@@ -160,10 +160,10 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="column_spacing">2</property>
-                        <property name="row_spacing">2</property>
-                        <property name="min_children_per_line">3</property>
-                        <property name="max_children_per_line">20</property>
+                        <property name="column_spacing">1</property>
+                        <property name="row_spacing">1</property>
+                        <property name="min_children_per_line">1</property>
+                        <property name="max_children_per_line">300</property>
                       </object>
                     </child>
                   </object>
diff --git a/share/ui/style.css b/share/ui/style.css
index 7dfd4a342..bbc60028e 100644
--- a/share/ui/style.css
+++ b/share/ui/style.css
@@ -219,14 +219,14 @@ spinbutton undershoot {
     border-right-width:0;
 }
 
-    #lpeflow GtkFlowBoxChild,
-    #lpeflow flowboxchild{
-        border-width:0px;
-        border-radius:6px;
-        margin:10px;
-        margin-bottom:30px;
-        padding-bottom:10px;
-    }
+#lpeflow GtkFlowBoxChild,
+#lpeflow flowboxchild{
+    border-width:0px;
+    border-radius:6px;
+    margin:10px;
+    margin-bottom:30px;
+    padding-bottom:10px;
+}
 
 #lpeflow GtkFlowBoxChild.lpeactive,
 #lpeflow flowboxchild.lpeactive{
@@ -245,7 +245,7 @@ spinbutton undershoot {
     border-radius:6px;
     margin:10px;
     padding:10px;
-    margin-bottom:20px;
+    margin-bottom:23px;
     padding-bottom:10px;
 }
   
@@ -255,6 +255,9 @@ spinbutton undershoot {
     padding-bottom:10px;
     outline:none;
 }
+.lpeactive #LPESelectorEffectFavTop{
+    opacity:0;
+}
 .lpefav{
     background-color: @theme_base_color;
     padding-bottom:0px;
diff --git a/src/ui/dialog/livepatheffect-add.cpp b/src/ui/dialog/livepatheffect-add.cpp
index c438cfa3e..0dbd8d062 100644
--- a/src/ui/dialog/livepatheffect-add.cpp
+++ b/src/ui/dialog/livepatheffect-add.cpp
@@ -119,17 +119,22 @@ LivePathEffectAdd::LivePathEffectAdd()
         builder_effect->get_widget("LPEIcon", LPEIcon);
         LPEIcon->set_from_icon_name(converter.get_icon(data->id), Gtk::BuiltinIconSize(Gtk::ICON_SIZE_DIALOG));
         Gtk::EventBox *LPESelectorEffectEventInfo;
-        //LPESelectorEffectEventFav->add_events(Gdk::BUTTON_PRESS_MASK);  
         builder_effect->get_widget("LPESelectorEffectEventInfo", LPESelectorEffectEventInfo);
         LPESelectorEffectEventInfo->signal_button_press_event().connect(sigc::bind<Glib::RefPtr<Gtk::Builder> >(sigc::mem_fun(*this, &LivePathEffectAdd::pop_description), builder_effect));
         Gtk::EventBox *LPESelectorEffectEventFav;
         builder_effect->get_widget("LPESelectorEffectEventFav", LPESelectorEffectEventFav);
-       // LPESelectorEffectEventFav->add_events(Gdk::BUTTON_PRESS_MASK);    
+        if (sp_has_fav(LPEName->get_text())){
+            Gtk::Image *fav = dynamic_cast<Gtk::Image *>(LPESelectorEffectEventFav->get_child());
+            fav->set_from_icon_name("draw-star", Gtk::IconSize(25));
+        }
         Gtk::EventBox *LPESelectorEffectEventFavTop;
         builder_effect->get_widget("LPESelectorEffectEventFavTop", LPESelectorEffectEventFavTop);
-        //LPESelectorEffectFavTop->add_events(Gdk::BUTTON_PRESS_MASK);    
-        LPESelectorEffectEventFav   ->signal_button_press_event().connect(sigc::bind<Glib::RefPtr<Gtk::Builder> >(sigc::mem_fun(*this, &LivePathEffectAdd::fav_toggler), builder_effect));
+        LPESelectorEffectEventFav->signal_button_press_event().connect(sigc::bind<Glib::RefPtr<Gtk::Builder> >(sigc::mem_fun(*this, &LivePathEffectAdd::fav_toggler), builder_effect));
         LPESelectorEffectEventFavTop->signal_button_press_event().connect(sigc::bind<Glib::RefPtr<Gtk::Builder> >(sigc::mem_fun(*this, &LivePathEffectAdd::fav_toggler), builder_effect));
+        Gtk::ButtonBox *LPESelectorButtonBox;
+        builder_effect->get_widget("LPESelectorButtonBox", LPESelectorButtonBox);
+        LPESelectorButtonBox->signal_enter_notify_event().connect(sigc::bind<GtkWidget *>(sigc::mem_fun(*this, &LivePathEffectAdd::mouseover), GTK_WIDGET(LPESelectorEffect->gobj())));
+        LPESelectorButtonBox->signal_leave_notify_event().connect(sigc::bind<GtkWidget *>(sigc::mem_fun(*this, &LivePathEffectAdd::mouseout), GTK_WIDGET(LPESelectorEffect->gobj())));
         LPESelectorEffect->signal_enter_notify_event().connect(sigc::bind<GtkWidget *>(sigc::mem_fun(*this, &LivePathEffectAdd::mouseover), GTK_WIDGET(LPESelectorEffect->gobj())));
         LPESelectorEffect->signal_leave_notify_event().connect(sigc::bind<GtkWidget *>(sigc::mem_fun(*this, &LivePathEffectAdd::mouseout), GTK_WIDGET(LPESelectorEffect->gobj())));
         _LPESelectorFlowBox->insert(*LPESelectorEffect, i);
@@ -212,6 +217,7 @@ bool LivePathEffectAdd::fav_toggler(GdkEventButton* evt, Glib::RefPtr<Gtk::Build
             //favimg->set_from_icon_name("draw-star-outline", Gtk::IconSize(30));
             LPESelectorEffectEventFavTop->set_visible(false);
             LPESelectorEffectEventFavTop->hide();
+            LPESelectorEffectFav->set_from_icon_name("draw-star-outline", Gtk::IconSize(25));
             sp_remove_fav(LPEName->get_text());
             LPESelectorEffect->get_parent()->get_style_context()->remove_class("lpefav");
             _LPESelectorFlowBox->invalidate_sort();
@@ -219,6 +225,7 @@ bool LivePathEffectAdd::fav_toggler(GdkEventButton* evt, Glib::RefPtr<Gtk::Build
             //favimg->set_from_icon_name("draw-star", Gtk::IconSize(30));
             LPESelectorEffectEventFavTop->set_visible(true);
             LPESelectorEffectEventFavTop->show();
+            LPESelectorEffectFav->set_from_icon_name("draw-star", Gtk::IconSize(25));
             sp_add_fav(LPEName->get_text());
             LPESelectorEffect->get_parent()->get_style_context()->add_class("lpefav");
             Glib::RefPtr< Gtk::Adjustment > vadjust = _LPEScrolled->get_vadjustment();
@@ -231,6 +238,7 @@ bool LivePathEffectAdd::fav_toggler(GdkEventButton* evt, Glib::RefPtr<Gtk::Build
 
 bool LivePathEffectAdd::on_filter(Gtk::FlowBoxChild *child)
 {
+    child->set_valign(Gtk::ALIGN_START);
     Gtk::EventBox *eventbox = dynamic_cast<Gtk::EventBox *>(child->get_child());
     if (eventbox) {
         Gtk::Box *box = dynamic_cast<Gtk::Box *>(eventbox->get_child());