[Xfce4-commits] [apps/xfce4-terminal] 01/01: Clean up TerminalZoomLevel enum

[noreply at xfce.org]

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

f2404 pushed a commit to branch master
in repository apps/xfce4-terminal.

commit f9aa23d9b726311ba9b5fd4d5e97e1146d0922e6
Author: Igor <f2404 at yandex.ru>
Date:   Tue Jul 26 13:43:04 2016 +0300

    Clean up TerminalZoomLevel enum
---
 terminal/terminal-options.h | 34 ++++++++++++++++------------------
 terminal/terminal-screen.c  | 36 ++++++++++++++++++------------------
 2 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/terminal/terminal-options.h b/terminal/terminal-options.h
index e426bf4..e0230d9 100644
--- a/terminal/terminal-options.h
+++ b/terminal/terminal-options.h
@@ -38,24 +38,22 @@ enum _TerminalVisibility
 
 enum _TerminalZoomLevel
 {
-  TERMINAL_ZOOM_LEVEL_XXXXXX_SMALL = -7,
-  TERMINAL_ZOOM_LEVEL_XXXXX_SMALL  = -6,
-  TERMINAL_ZOOM_LEVEL_XXXX_SMALL   = -5,
-  TERMINAL_ZOOM_LEVEL_XXX_SMALL    = -4,
-  TERMINAL_ZOOM_LEVEL_XX_SMALL     = -3,
-  TERMINAL_ZOOM_LEVEL_X_SMALL      = -2,
-  TERMINAL_ZOOM_LEVEL_SMALL        = -1,
-  TERMINAL_ZOOM_LEVEL_MEDIUM       = 0,
-  TERMINAL_ZOOM_LEVEL_LARGE        = +1,
-  TERMINAL_ZOOM_LEVEL_X_LARGE      = +2,
-  TERMINAL_ZOOM_LEVEL_XX_LARGE     = +3,
-  TERMINAL_ZOOM_LEVEL_XXX_LARGE    = +4,
-  TERMINAL_ZOOM_LEVEL_XXXX_LARGE   = +5,
-  TERMINAL_ZOOM_LEVEL_XXXXX_LARGE  = +6,
-  TERMINAL_ZOOM_LEVEL_XXXXXX_LARGE = +7,
-  TERMINAL_ZOOM_LEVEL_MINIMUM   = TERMINAL_ZOOM_LEVEL_XXXXXX_SMALL,
-  TERMINAL_ZOOM_LEVEL_MAXIMUM   = TERMINAL_ZOOM_LEVEL_XXXXXX_LARGE,
-  TERMINAL_ZOOM_LEVEL_DEFAULT   = TERMINAL_ZOOM_LEVEL_MEDIUM,
+  TERMINAL_ZOOM_LEVEL_MINIMUM     = -7,
+  TERMINAL_ZOOM_LEVEL_XXXXX_SMALL = -6,
+  TERMINAL_ZOOM_LEVEL_XXXX_SMALL  = -5,
+  TERMINAL_ZOOM_LEVEL_XXX_SMALL   = -4,
+  TERMINAL_ZOOM_LEVEL_XX_SMALL    = -3,
+  TERMINAL_ZOOM_LEVEL_X_SMALL     = -2,
+  TERMINAL_ZOOM_LEVEL_SMALL       = -1,
+  TERMINAL_ZOOM_LEVEL_MEDIUM      = 0,
+  TERMINAL_ZOOM_LEVEL_LARGE       = +1,
+  TERMINAL_ZOOM_LEVEL_X_LARGE     = +2,
+  TERMINAL_ZOOM_LEVEL_XX_LARGE    = +3,
+  TERMINAL_ZOOM_LEVEL_XXX_LARGE   = +4,
+  TERMINAL_ZOOM_LEVEL_XXXX_LARGE  = +5,
+  TERMINAL_ZOOM_LEVEL_XXXXX_LARGE = +6,
+  TERMINAL_ZOOM_LEVEL_MAXIMUM     = +7,
+  TERMINAL_ZOOM_LEVEL_DEFAULT     = TERMINAL_ZOOM_LEVEL_MEDIUM
 };
 
 struct _TerminalTabAttr
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index b8d6f10..6b2b94c 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -1511,24 +1511,24 @@ gchar* terminal_screen_zoom_font (TerminalScreen *screen,
   terminal_return_val_if_fail (font_name != NULL, NULL);
 
   switch (zoom)
-   {
-     case TERMINAL_ZOOM_LEVEL_XXXXXX_SMALL: scale = PANGO_SCALE_XX_SMALL/1.2/1.2/1.2/1.2; break;
-     case TERMINAL_ZOOM_LEVEL_XXXXX_SMALL:  scale = PANGO_SCALE_XX_SMALL/1.2/1.2/1.2;     break;
-     case TERMINAL_ZOOM_LEVEL_XXXX_SMALL:   scale = PANGO_SCALE_XX_SMALL/1.2/1.2;         break;
-     case TERMINAL_ZOOM_LEVEL_XXX_SMALL:    scale = PANGO_SCALE_XX_SMALL/1.2;             break;
-     case TERMINAL_ZOOM_LEVEL_XX_SMALL:     scale = PANGO_SCALE_XX_SMALL;                 break;
-     case TERMINAL_ZOOM_LEVEL_X_SMALL:      scale = PANGO_SCALE_X_SMALL;                  break;
-     case TERMINAL_ZOOM_LEVEL_SMALL:        scale = PANGO_SCALE_SMALL;                    break;
-     case TERMINAL_ZOOM_LEVEL_LARGE:        scale = PANGO_SCALE_LARGE;                    break;
-     case TERMINAL_ZOOM_LEVEL_X_LARGE:      scale = PANGO_SCALE_X_LARGE;                  break;
-     case TERMINAL_ZOOM_LEVEL_XX_LARGE:     scale = PANGO_SCALE_XX_LARGE;                 break;
-     case TERMINAL_ZOOM_LEVEL_XXX_LARGE:    scale = PANGO_SCALE_XX_LARGE*1.2;             break;
-     case TERMINAL_ZOOM_LEVEL_XXXX_LARGE:   scale = PANGO_SCALE_XX_LARGE*1.2*1.2;         break;
-     case TERMINAL_ZOOM_LEVEL_XXXXX_LARGE:  scale = PANGO_SCALE_XX_LARGE*1.2*1.2*1.2;     break;
-     case TERMINAL_ZOOM_LEVEL_XXXXXX_LARGE: scale = PANGO_SCALE_XX_LARGE*1.2*1.2*1.2*1.2; break;
-     default:
-       return font_name;
-   }
+    {
+      case TERMINAL_ZOOM_LEVEL_MINIMUM:     scale = PANGO_SCALE_XX_SMALL/1.2/1.2/1.2/1.2; break;
+      case TERMINAL_ZOOM_LEVEL_XXXXX_SMALL: scale = PANGO_SCALE_XX_SMALL/1.2/1.2/1.2;     break;
+      case TERMINAL_ZOOM_LEVEL_XXXX_SMALL:  scale = PANGO_SCALE_XX_SMALL/1.2/1.2;         break;
+      case TERMINAL_ZOOM_LEVEL_XXX_SMALL:   scale = PANGO_SCALE_XX_SMALL/1.2;             break;
+      case TERMINAL_ZOOM_LEVEL_XX_SMALL:    scale = PANGO_SCALE_XX_SMALL;                 break;
+      case TERMINAL_ZOOM_LEVEL_X_SMALL:     scale = PANGO_SCALE_X_SMALL;                  break;
+      case TERMINAL_ZOOM_LEVEL_SMALL:       scale = PANGO_SCALE_SMALL;                    break;
+      case TERMINAL_ZOOM_LEVEL_LARGE:       scale = PANGO_SCALE_LARGE;                    break;
+      case TERMINAL_ZOOM_LEVEL_X_LARGE:     scale = PANGO_SCALE_X_LARGE;                  break;
+      case TERMINAL_ZOOM_LEVEL_XX_LARGE:    scale = PANGO_SCALE_XX_LARGE;                 break;
+      case TERMINAL_ZOOM_LEVEL_XXX_LARGE:   scale = PANGO_SCALE_XX_LARGE*1.2;             break;
+      case TERMINAL_ZOOM_LEVEL_XXXX_LARGE:  scale = PANGO_SCALE_XX_LARGE*1.2*1.2;         break;
+      case TERMINAL_ZOOM_LEVEL_XXXXX_LARGE: scale = PANGO_SCALE_XX_LARGE*1.2*1.2*1.2;     break;
+      case TERMINAL_ZOOM_LEVEL_MAXIMUM:     scale = PANGO_SCALE_XX_LARGE*1.2*1.2*1.2*1.2; break;
+      default:
+        return font_name;
+    }
 
   font_desc = pango_font_description_from_string (font_name);
   if (font_desc == NULL)

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