gtknotebook: Simplify some if-conditions
authorPhilip Withnall <withnall@endlessm.com>
Mon, 11 Sep 2017 08:26:52 +0000 (09:26 +0100)
committerDaniel Boles <dboles@src.gnome.org>
Tue, 12 Sep 2017 20:15:53 +0000 (21:15 +0100)
Signed-off-by: Philip Withnall <withnall@endlessm.com>
https://bugzilla.gnome.org/show_bug.cgi?id=787303

gtk/gtknotebook.c

index 56b601dfc127b7f46e1cff0d5277e6ec072b360d..747dbd7943c38f193e77455694940205da3835f1 100644 (file)
@@ -5952,8 +5952,7 @@ gtk_notebook_calculate_tabs_allocation (GtkNotebook          *notebook,
         {
         case GTK_POS_TOP:
         case GTK_POS_BOTTOM:
-          if (priv->operation != DRAG_OPERATION_REORDER ||
-              (priv->operation == DRAG_OPERATION_REORDER && page != priv->cur_page))
+          if (priv->operation != DRAG_OPERATION_REORDER || page != priv->cur_page)
             {
               if (priv->operation == DRAG_OPERATION_REORDER)
                 {
@@ -5974,8 +5973,7 @@ gtk_notebook_calculate_tabs_allocation (GtkNotebook          *notebook,
           break;
         case GTK_POS_LEFT:
         case GTK_POS_RIGHT:
-          if (priv->operation != DRAG_OPERATION_REORDER  ||
-              (priv->operation == DRAG_OPERATION_REORDER && page != priv->cur_page))
+          if (priv->operation != DRAG_OPERATION_REORDER || page != priv->cur_page)
             {
               if (priv->operation == DRAG_OPERATION_REORDER)
                 {