statusbar improvements

data/one-dark.scss

@@ -444,8 +444,5 @@ window {
     background-color: $level-3-color;
     border-top: 1px solid $base-border-color;
     color: $text-color;
-    label {
-      padding: 0 0.75em;
-    }
   }
 }

meson.build

@@ -6,6 +6,7 @@ executable(
   'src/window.vala',
   'src/notebook.vala',
   'src/text-editor-container.vala',
+  'src/statusbar.vala',
   'src/atom.vapi',
   'src/text-editor-widget.cc',
   import('gnome').compile_resources(

src/statusbar.vala

@@ -0,0 +1,37 @@
+namespace Atom {
+
+class Statusbar : Gtk.Box {
+  static construct {
+    set_css_name("statusbar");
+  }
+
+  public Statusbar(Atom.TextEditorWidget text_editor_widget) {
+    Object(orientation: Gtk.Orientation.HORIZONTAL, spacing: 2);
+
+    var cursor_position_label = new Gtk.Label(null);
+    text_editor_widget.bind_property("cursor-position", cursor_position_label, "label", BindingFlags.SYNC_CREATE);
+    pack_start(pack(cursor_position_label), false);
+
+    var grammar_label = new Gtk.Label(null);
+    text_editor_widget.bind_property("grammar", grammar_label, "label", BindingFlags.SYNC_CREATE);
+    pack_end(pack(grammar_label), false);
+
+    var encoding_label = new Gtk.Label("UTF-8");
+    encoding_label.tooltip_text = "This file uses UTF-8 encoding";
+    pack_end(pack(encoding_label), false);
+  }
+
+  private static Gtk.Widget pack(Gtk.Widget child) {
+    var frame = new Gtk.Frame(null);
+    frame.shadow_type = Gtk.ShadowType.NONE;
+    var box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 4);
+    box.margin = 4;
+    box.margin_start = 11;
+    box.margin_end = 11;
+    box.add(child);
+    frame.add(box);
+    return frame;
+  }
+}
+
+}

src/text-editor-container.vala

@@ -10,16 +10,7 @@ class TextEditorContainer : Gtk.Box {
     text_editor_widget = new Atom.TextEditorWidget(file);
     scrolled_window.add(text_editor_widget);
     pack_start(scrolled_window, true);
-    var status_bar = new Gtk.Statusbar();
-    status_bar.margin = 0;
-    var cursor_position_label = new Gtk.Label(null);
-    text_editor_widget.bind_property("cursor-position", cursor_position_label, "label", BindingFlags.SYNC_CREATE);
-    status_bar.pack_start(cursor_position_label, false);
-    status_bar.reorder_child(cursor_position_label, 0);
-    var grammar_label = new Gtk.Label(null);
-    text_editor_widget.bind_property("grammar", grammar_label, "label", BindingFlags.SYNC_CREATE);
-    status_bar.pack_end(grammar_label, false);
-    status_bar.pack_end(new Gtk.Label("UTF-8"), false);
+    var status_bar = new Atom.Statusbar(text_editor_widget);
     pack_start(status_bar, false);
   }