Merge pull request #32 from tpikonen/vertical

Use a vertical label on a vertical panel

extension.js

@@ -1,4 +1,4 @@
-const { Clutter, St, GObject } = imports.gi;
+const { Clutter, St, GObject, Pango } = imports.gi;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 
@@ -25,10 +25,14 @@ let WorkspaceIndicator = GObject.registerClass(
 
             this._statusLabel = new St.Label({
                 style_class: "panel-button-text",
-                text: getWidgetText(),
+                text: this.getWidgetText(),
                 x_expand: true,
+                y_expand: true,
                 y_align: Clutter.ActorAlign.CENTER,
             });
+            this._statusLabel.clutter_text.line_wrap = true;
+            this._statusLabel.clutter_text.line_wrap_mode = Pango.WrapMode.CHAR;
+            this._statusLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
             this._container.add_actor(this._statusLabel);
 
             let workspaceManager = global.workspace_manager;
@@ -49,7 +53,7 @@ let WorkspaceIndicator = GObject.registerClass(
         }
 
         _updateView() {
-            this._statusLabel.text = getWidgetText();
+            this._statusLabel.text = this.getWidgetText();
         }
 
         _onButtonPress(actor, event) {
@@ -75,6 +79,24 @@ let WorkspaceIndicator = GObject.registerClass(
                 }
             }
         }
+
+        isHorizontal() {
+            let settings = ExtensionUtils.getSettings();
+            let orientation = settings.get_string("widget-orientation");
+            return orientation != 'vertical';
+        }
+
+        getWidgetText() {
+            let items = [];
+            let numberWorkspaces = global.workspace_manager.get_n_workspaces();
+            let currentWorkspaceIndex = global.workspace_manager.get_active_workspace_index();
+            let separator = this.isHorizontal() ? "" : "\n";
+
+            for (let i = 0; i < numberWorkspaces; i++) {
+                items.push(i == currentWorkspaceIndex ? bullet : circle);
+            }
+            return items.join(separator)
+        }
     }
 );
 
@@ -105,20 +127,6 @@ function getWidgetIndex(position) {
     return 1
 }
 
-function getWidgetText() {
-    let txt = "";
-    let numberWorkspaces = global.workspace_manager.get_n_workspaces();
-    let currentWorkspaceIndex = global.workspace_manager.get_active_workspace_index();
-    for (let i = 0; i < numberWorkspaces; i++) {
-        if (i == currentWorkspaceIndex) {
-            txt += bullet;
-        } else {
-            txt += circle;
-        }
-    }
-    return txt
-}
-
 function init(meta) {
     return new Extension(meta.uuid);
-}
+}

prefs.js

@@ -57,5 +57,23 @@ function buildPrefsWidget() {
     );
     prefsWidget.attach(widgetPositionComboBox, 1, 2, 1, 1);
 
+    const widgetOrientationLabel = new Gtk.Label({
+        label: "Widget orientation",
+        halign: Gtk.Align.START,
+        visible: true,
+    });
+    prefsWidget.attach(widgetOrientationLabel, 0, 3, 1, 1);
+
+    const widgetOrientationComboBox = new Gtk.ComboBoxText();
+    widgetOrientationComboBox.append("horizontal", "Horizontal");
+    widgetOrientationComboBox.append("vertical", "Vertical");
+    this.settings.bind(
+        "widget-orientation",
+        widgetOrientationComboBox,
+        "active-id",
+        Gio.SettingsBindFlags.DEFAULT
+    );
+    prefsWidget.attach(widgetOrientationComboBox, 1, 3, 1, 1);
+
     return prefsWidget;
 }

schemas/org.gnome.shell.extensions.horizontal-workspace-indicator.gschema.xml

@@ -11,5 +11,14 @@
       <summary>Widget position</summary>
       <description>This specifies the position of widget on the left, center or right of top panel.</description>
     </key>
+    <key name="widget-orientation" type="s">
+      <choices>
+        <choice value="horizontal"/>
+        <choice value="vertical"/>
+      </choices>
+      <default>'horizontal'</default>
+      <summary>Widget orientation</summary>
+      <description>This specifies the orientation of the dots in the widget, horizontal or vertical (for vertical panels).</description>
+    </key>
   </schema>
 </schemalist>