glimmer-cs-gladiator 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d57a77e5086a7cab8a622d21e6ef4d4089d544e6c8d28f709fb19405523db22e
-  data.tar.gz: 8e36f9855229b227658b2873cfece17ea0fd214f447b5cb561d3126f05234f28
+  metadata.gz: 42a4c55757f8f11ff94253067439895f7e1c0a1a1ebb3aaaf6d9d1d068ea82eb
+  data.tar.gz: d09c688ba5042f0be4489347c6937780b5e06e815d8879499f30c73857a27969
 SHA512:
-  metadata.gz: b4795a89aab52db16e32c47b06fdf8800dff22418de7b07c5421704d9be285fdb8c1c230e3d9a068a74aaf85637e7c17a34c74fe3298f75d24c874e6d108b0c9
-  data.tar.gz: 8b811a0f1278860b79c334fdebb71eb0c1116e94cfceb028b87e03bc7d06fc904fef4549f789cc6a79e643b2509058268dd6e39623a1823279796d2b4138f5d8
+  metadata.gz: 6b3d619fbf4ad18ce233d86bfa6fcd902b3865e0177fac7021392354f72a07f0c93c47e70cb066a0e21c4358592f13b2f24dd66123d15c66eb971f6e2941ce57
+  data.tar.gz: fa59fa6baab0ef8b35ff6864692739f98a6f515cc63a61320cb12c92141c810364570e880e923e657401e1c56a533d98abbcc89fb609ad02126a9da39ed05e5f

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 0.7.1
+
+- Update View -> Reset All to also reset the File Lookup/File Explorer Sash Width and the Navigation Bar (expanding it)
+- Fix issue with split, reset split, unsplit, and then split again forgetting the reset for the sash width
+- Ensure closing a single tab moves user back to the previous tab
+- Add pkg to ignore paths
+- Update Reset All menu item to reset splits too
+
 ## 0.7.0
 
 - Upgrade to glimmer-dsl-swt v4.18.0.0

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2020 Andy Maleh
+Copyright (c) 2020-2021 Andy Maleh
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,4 +1,4 @@
-# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.7.0 - [Ugliest Text Editor Ever](https://www.reddit.com/r/ruby/comments/hgve8k/gladiator_glimmer_editor_ugliest_text_editor_ever/)
+# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.7.1 - [Ugliest Text Editor Ever!](https://www.reddit.com/r/ruby/comments/hgve8k/gladiator_glimmer_editor_ugliest_text_editor_ever/)
 ## [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 /> Glimmer Custom Shell](https://github.com/AndyObtiva/glimmer-dsl-swt#custom-shell-gem)
 [![Gem Version](https://badge.fury.io/rb/glimmer-cs-gladiator.svg)](http://badge.fury.io/rb/glimmer-cs-gladiator)
 
@@ -150,7 +150,7 @@ To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application,
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '>= 0.7.0'
+gem 'glimmer-cs-gladiator', '>= 0.7.1'
 ```
 
 Run:
@@ -214,7 +214,7 @@ The signal TERM is in use by the JVM and will not work correctly on this platfor
 
 [MIT](https://opensource.org/licenses/MIT)
 
-Copyright (c) 2020 Andy Maleh. See [LICENSE.txt](LICENSE.txt) for further details.
+Copyright (c) 2020-2021 Andy Maleh. See [LICENSE.txt](LICENSE.txt) for further details.
 
 --
 

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/glimmer-cs-gladiator.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-cs-gladiator 0.7.0 ruby lib
+# stub: glimmer-cs-gladiator 0.7.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-cs-gladiator".freeze
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Andy Maleh".freeze]
-  s.date = "2021-01-11"
+  s.date = "2021-01-15"
   s.description = "Gladiator (short for Glimmer Editor) is a Glimmer sample project under on-going development. It is not intended to be a full-fledged editor by any means, yet mostly a fun educational exercise in using Glimmer to build a text editor. Gladiator is also a personal tool for shaping an editor exactly the way I like. I leave building truly professional text editors to software tooling experts who would hopefully use Glimmer one day.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["gladiator".freeze]

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

@@ -36,7 +36,7 @@ module Glimmer
         end
         self.path = ::File.expand_path(path)
         @name = ::File.basename(::File.expand_path(path))
-        @ignore_paths = ['.gladiator', '.git', 'coverage', 'packages', 'node_modules', 'tmp', 'vendor']
+        @ignore_paths = ['.gladiator', '.git', 'coverage', 'packages', 'node_modules', 'tmp', 'vendor', 'pkg']
         self.filtered_path_options = []
       end
       

data/lib/views/glimmer/gladiator.rb

@@ -180,8 +180,14 @@ module Glimmer
       end
       observe(self, 'maximized_editor') do
         @file_area_and_editor_area_sash_form.maximized_control = (@editor_area_composite.swt_widget if maximized_editor?)
+        if !maximized_editor?
+          expand_navigation_expand_bar_height
+        else
+          collapse_navigation_expand_bar_height
+        end
         @navigation_expand_item.swt_expand_item.set_expanded !maximized_editor?
         body_root.pack_same_size
+        async_exec { body_root.pack_same_size }
       end
       observe(project_dir, 'selected_child') do
         save_config
@@ -337,6 +343,7 @@ module Glimmer
               on_widget_selected {
                 self.maximized_editor = false
                 @file_area_and_editor_area_sash_form.weights = [1, 5]
+                @side_bar_sash_form.weights = [1, 1]
               }
             }
           }
@@ -622,7 +629,7 @@ module Glimmer
                 grid_layout(5, false) {
                   margin_right 5
                 }
-                              
+                
                 stat_font = {name: 'Consolas', height: OS.mac? ? 15 : 12}
     
                 # row 1
@@ -799,7 +806,7 @@ module Glimmer
               }
             
               on_item_expanded {
-                expand_navigation_expand_bar
+                expand_navigation_expand_bar_height
               }
             
             }
@@ -1003,7 +1010,7 @@ module Glimmer
       end
     end
     
-    def close_tab_folder(closing_tab_folder = nil)
+    def close_tab_folder(closing_tab_folder = nil, single_tab: false)
       closing_tab_folder ||= current_tab_folder
       if @tab_folder2 && !selected_tab_item
         if closing_tab_folder == @tab_folder2
@@ -1021,7 +1028,7 @@ module Glimmer
         project_dir.selected_child = @current_tab_item.swt_tab_item.getData('file')
         @current_text_editor&.text_widget&.setFocus
         async_exec { @current_text_editor&.text_widget&.setFocus }
-      else
+      elsif !single_tab
         self.current_tab_item = self.current_text_editor = project_dir.selected_child = nil
       end
     end
@@ -1042,17 +1049,13 @@ module Glimmer
       @navigation_expand_item_height = @navigation_expand_item.swt_expand_item.height if @navigation_expand_item.swt_expand_item.height > 0
       @navigation_expand_item.swt_expand_item.height = 0
       body_root.pack_same_size
-      async_exec {
-        body_root.pack_same_size
-      }
+      async_exec { body_root.pack_same_size }
     end
 
     def expand_navigation_expand_bar_height
-      @navigation_expand_item.swt_expand_item.height = @navigation_expand_item_height if @navigation_expand_item_height
+      @navigation_expand_item.swt_expand_item.height = @navigation_expand_item_height || 140
       body_root.pack_same_size
-      async_exec {
-        body_root.pack_same_size
-      }
+      async_exec { body_root.pack_same_size }
     end
 
     def extract_tree_item_path(tree_item)
@@ -1257,7 +1260,9 @@ module Glimmer
         project_dir.selected_child.find_previous
       elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'o'
         self.maximized_pane = false
+        old_split_orientation = self.split_orientation
         self.split_orientation = split_pane? && split_orientation == swt(:horizontal) ? swt(:vertical) : swt(:horizontal)
+        @tab_folder_sash_form.weights = [1, 1] if old_split_orientation.nil?
       elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'w'
         close_all_tabs
       elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :alt) && extract_char(key_event) == 'w'
@@ -1269,13 +1274,20 @@ module Glimmer
         if selected_tab_item
           project_dir.selected_child_path_history.delete(project_dir.selected_child.path)
           selected_tab_item.getData('proxy')&.dispose
-          close_tab_folder
+          close_tab_folder(single_tab: true)
+#           if self.current_tab_item.nil?
+#             filter_text.swt_widget.selectAll
+#             filter_text.swt_widget.setFocus
+#           else
+#             current_text_editor&.text_widget&.setFocus
+#           end
           if selected_tab_item.nil?
             self.current_tab_item = self.current_text_editor = project_dir.selected_child = nil
             filter_text.swt_widget.selectAll
             filter_text.swt_widget.setFocus
           else
             current_text_editor&.text_widget&.setFocus
+#             async_exec { current_text_editor&.text_widget&.setFocus }
           end
         end
       elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == ']'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement