[libhandy/wip/exalm/leaflet-transltions: 19/32] leaflet: Remove NONE transition type



commit b56309e0161af2f18b55f28230d539bd0e970170
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Thu Jun 4 18:06:59 2020 +0500

    leaflet: Remove NONE transition type
    
    Signed-off-by: Alexander Mikhaylenko <alexm gnome org>

 examples/hdy-demo-window.c |  2 --
 glade/libhandy.xml         |  2 --
 src/hdy-leaflet.c          | 10 +---------
 src/hdy-leaflet.h          |  1 -
 4 files changed, 1 insertion(+), 14 deletions(-)
---
diff --git a/examples/hdy-demo-window.c b/examples/hdy-demo-window.c
index 22665601..cf887a68 100644
--- a/examples/hdy-demo-window.c
+++ b/examples/hdy-demo-window.c
@@ -145,8 +145,6 @@ leaflet_transition_name (HdyEnumValueObject *value,
   g_return_val_if_fail (HDY_IS_ENUM_VALUE_OBJECT (value), NULL);
 
   switch (hdy_enum_value_object_get_value (value)) {
-  case HDY_LEAFLET_TRANSITION_TYPE_NONE:
-    return g_strdup (_("None"));
   case HDY_LEAFLET_TRANSITION_TYPE_OVER:
     return g_strdup (_("Over"));
   case HDY_LEAFLET_TRANSITION_TYPE_UNDER:
diff --git a/glade/libhandy.xml b/glade/libhandy.xml
index 0aa5ff49..29d2d5d3 100644
--- a/glade/libhandy.xml
+++ b/glade/libhandy.xml
@@ -262,8 +262,6 @@
         </property>
         <property id="transition-type">
           <displayable-values>
-            <!-- HdyLeafletTransitionType enumeration value -->
-            <value id="HDY_LEAFLET_TRANSITION_TYPE_NONE" name="None"/>
             <!-- HdyLeafletTransitionType enumeration value -->
             <value id="HDY_LEAFLET_TRANSITION_TYPE_OVER" name="Over"/>
             <!-- HdyLeafletTransitionType enumeration value -->
diff --git a/src/hdy-leaflet.c b/src/hdy-leaflet.c
index 6a1f8db5..b70b3df9 100644
--- a/src/hdy-leaflet.c
+++ b/src/hdy-leaflet.c
@@ -34,7 +34,6 @@
 
 /**
  * HdyLeafletTransitionType:
- * @HDY_LEAFLET_TRANSITION_TYPE_NONE: No transition
  * @HDY_LEAFLET_TRANSITION_TYPE_OVER: Cover the old page or uncover the new page, sliding from or towards 
the end according to orientation, text direction and children order
  * @HDY_LEAFLET_TRANSITION_TYPE_UNDER: Uncover the new page or cover the old page, sliding from or towards 
the start according to orientation, text direction and children order
  * @HDY_LEAFLET_TRANSITION_TYPE_SLIDE: Slide from left, right, up or down according to the orientation, text 
direction and the children order
@@ -170,14 +169,11 @@ hdy_leaflet_get_transition_type (HdyLeaflet *self)
 {
   HdyStackableBoxTransitionType type;
 
-  g_return_val_if_fail (HDY_IS_LEAFLET (self), HDY_LEAFLET_TRANSITION_TYPE_NONE);
+  g_return_val_if_fail (HDY_IS_LEAFLET (self), HDY_LEAFLET_TRANSITION_TYPE_OVER);
 
   type = hdy_stackable_box_get_transition_type (HDY_GET_HELPER (self));
 
   switch (type) {
-  case HDY_STACKABLE_BOX_TRANSITION_TYPE_NONE:
-    return HDY_LEAFLET_TRANSITION_TYPE_NONE;
-
   case HDY_STACKABLE_BOX_TRANSITION_TYPE_OVER:
     return HDY_LEAFLET_TRANSITION_TYPE_OVER;
 
@@ -216,10 +212,6 @@ hdy_leaflet_set_transition_type (HdyLeaflet               *self,
   g_return_if_fail (transition <= HDY_LEAFLET_TRANSITION_TYPE_SLIDE);
 
   switch (transition) {
-  case HDY_LEAFLET_TRANSITION_TYPE_NONE:
-    type = HDY_STACKABLE_BOX_TRANSITION_TYPE_NONE;
-    break;
-
   case HDY_LEAFLET_TRANSITION_TYPE_OVER:
     type = HDY_STACKABLE_BOX_TRANSITION_TYPE_OVER;
     break;
diff --git a/src/hdy-leaflet.h b/src/hdy-leaflet.h
index faff0383..6c1e006d 100644
--- a/src/hdy-leaflet.h
+++ b/src/hdy-leaflet.h
@@ -21,7 +21,6 @@ G_BEGIN_DECLS
 G_DECLARE_DERIVABLE_TYPE (HdyLeaflet, hdy_leaflet, HDY, LEAFLET, GtkContainer)
 
 typedef enum {
-  HDY_LEAFLET_TRANSITION_TYPE_NONE,
   HDY_LEAFLET_TRANSITION_TYPE_OVER,
   HDY_LEAFLET_TRANSITION_TYPE_UNDER,
   HDY_LEAFLET_TRANSITION_TYPE_SLIDE,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]