glimmer-cs-gladiator 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10060190546fe60cbf5c1e130191ed12ff17ea7deee820fd9294ad59b04b8dfa
-  data.tar.gz: f6ad081752171216f5980a1a5d9508d1c433ed9cd35cdcb5c2f5c022254376c8
+  metadata.gz: 62d1ccef9ac560b19d5acff7ff5513145fa26fef6f326a9e5d0679890783a0c6
+  data.tar.gz: f23b2e85d6158c3e1fa7b3314939042a0fc13a0a2707800ecc3233907ebc4640
 SHA512:
-  metadata.gz: '092bcecbbcc5fa79cbc4e085546f3b37760e429369498fb24508cffacef919c0e89d1d84c3faa75fe9a38a35bfbae0fb280a273aa6d0b479134b1724145e7f6d'
-  data.tar.gz: 50893f0dc416e754ca5e589cc82164cb6214c3b56090759bb085e4a8c61cf96c4423002a986740b923c0ffc6861eb8706fa3d44fefe7d1ca298cd179c835e242
+  metadata.gz: 0b46d9f5617ef754cc5b791a8e57b60581a355f6f267300dc3282c8dbe937b78adf6cfe55efb5045dd9d7c46653a5bf0cd7fb79bac6451054c588aef088a7784
+  data.tar.gz: b4dbe7eabd3345ce74ea585584ba5e0bf6acd6b0192289f885418cc51ef6ec5fa3ab9f98fd5223a89cd0efbe09a00974f5bf4bb3cbc4038a8f3a3ab08e86e903

data/README.md

@@ -1,4 +1,4 @@
-# Gladiator (Glimmer Editor) 0.1.1 - Glimmer Custom Shell
+# Gladiator (Glimmer Editor) 0.1.2 - Glimmer Custom Shell
 [![Gem Version](https://badge.fury.io/rb/glimmer-cs-gladiator.svg)](http://badge.fury.io/rb/glimmer-cs-gladiator)
 
 ![Gladiator](images/glimmer-gladiator.png)
@@ -17,6 +17,7 @@ Gladiator currently supports the following text editing features:
 - Remember last opened file, caret position, and top line
 - Autosave on focus out/quit/open new file
 - Watch open file for external changes to reflect in editor
+- Watch subdirectories for changes to reflect in file explorer/file lookup
 - Duplicate Line(s)
 - Kill Line(s)
 - Move up one line
@@ -49,7 +50,7 @@ To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application,
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '0.1.1'
+gem 'glimmer-cs-gladiator', '0.1.2'
 ```
 
 Run:

data/lib/models/glimmer/gladiator/file.rb

@@ -26,7 +26,8 @@ module Glimmer
           end
           observe(self, :line_number) do
             if line_number
-              new_caret_position = lines[0...(line_number.to_i - 1)].map(&:size).sum + line_number.to_i - 1
+              line_index = line_number - 1
+              new_caret_position = caret_position_for_line_index(line_index)
               self.caret_position = new_caret_position unless line_index_for_caret_position(new_caret_position) == line_index_for_caret_position(caret_position)
             end
           end
@@ -318,7 +319,9 @@ module Glimmer
       end
   
       def caret_position_for_line_index(line_index)
-        lines[0...line_index].join("\n").size + 1
+        cp = lines[0...line_index].join("\n").size
+        cp += 1 if line_index > 0
+        cp
       end
   
       def caret_position_for_caret_position_start_of_line(caret_position)

data/lib/views/glimmer/gladiator.rb

@@ -55,6 +55,9 @@ module Glimmer
     ## Uncomment after_body block to setup observers for widgets in body
     #
     after_body {
+      observe(Gladiator::Dir.local_dir, 'selected_child') do
+        @field_container.swt_widget.pack
+      end
       observe(Gladiator::Dir.local_dir, 'selected_child.line_numbers_content') do
         if @last_line_numbers_content != Gladiator::Dir.local_dir.selected_child.line_numbers_content
           body_root.pack_same_size
@@ -134,7 +137,7 @@ module Glimmer
               }
               on_key_pressed { |key_event|
                 if Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :cr) || Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :lf)
-                  Gladiator::Dir.local_dir.selected_child_path = @tree.swt_widget.getSelection.first.getText
+                  Gladiator::Dir.local_dir.selected_child_path = @tree.swt_widget.getSelection&.first&.getText
                   @text.swt_widget.setFocus
                 end
               }
@@ -150,7 +153,7 @@ module Glimmer
         composite {
           grid_layout 1, false
           layout_data :fill, :fill, true, true
-          composite {
+          @field_container = composite {
             grid_layout 2, false
             @file_path_label = styled_text(:none) {
               layout_data(:fill, :fill, true, false) {
@@ -175,7 +178,7 @@ module Glimmer
                 minimum_width 300
               }
               text bind(Gladiator::Dir.local_dir, 'selected_child.line_number', on_read: :to_s, on_write: :to_i)
-      	     on_key_pressed { |key_event|
+              on_key_pressed { |key_event|
                 if key_event.keyCode == swt(:cr)
                   @text.swt_widget.setFocus
                 end
@@ -186,10 +189,10 @@ module Glimmer
             }
             @find_text = text {
               layout_data(:fill, :fill, true, false) {
-                minimum_width 200
+                minimum_width 300
               }
               text bind(Gladiator::Dir.local_dir, 'selected_child.find_text')
-      	     on_key_pressed { |key_event|
+              on_key_pressed { |key_event|
                 if key_event.keyCode == swt(:cr)
                   Gladiator::Dir.local_dir.selected_child.find_next
                 elsif key_event.keyCode == swt(:esc)
@@ -202,13 +205,13 @@ module Glimmer
             }
             @replace_text = text {
               layout_data(:fill, :fill, true, false) {
-                minimum_width 200
+                minimum_width 300
               }
               text bind(Gladiator::Dir.local_dir, 'selected_child.replace_text')
               on_focus_gained {              
                 Gladiator::Dir.local_dir.selected_child.ensure_find_next
               }
-      	     on_key_pressed { |key_event|
+              on_key_pressed { |key_event|
                 if key_event.keyCode == swt(:cr)
                   Gladiator::Dir.local_dir.selected_child.replace_next!
                 elsif key_event.keyCode == swt(:esc)

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-11 00:00:00.000000000 Z
+date: 2020-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.2
   name: glimmer
   type: :runtime
   prerelease: false
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: