Bump version

Gemfile.lock

@@ -1,16 +1,13 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    clipboard (1.3.6)
     cri (2.1.0)
-    cyberarm_engine (0.19.1)
+    cyberarm_engine (0.23.0)
-      clipboard (~> 1.3.5)
+      excon (~> 0.88)
-      excon (~> 0.78.0)
       gosu (~> 1.1)
       gosu_more_drawables (~> 0.3)
-    excon (0.78.1)
+    excon (0.98.0)
-    ffi (1.15.4-x64-mingw32)
+    gosu (1.4.5)
-    gosu (1.2.0)
     gosu_more_drawables (0.3.1)
     gosu_notifications (0.1.0)
     ocra (1.3.11)
@@ -22,16 +19,15 @@ GEM
       rake (>= 0.9.2.2)
 
 PLATFORMS
+  x64-mingw-ucrt
   x64-mingw32
   x86_64-linux
 
 DEPENDENCIES
-  clipboard
   cyberarm_engine
-  ffi
   gosu_notifications
   ocra
   releasy
 
 BUNDLED WITH
-   2.2.28
+   2.4.3

Rakefile

@@ -18,12 +18,12 @@ Releasy::Project.new do
     "media/music/.gitkeep",
     "media/particles/.gitkeep"
   ]
-  exclude_encoding # Applications that don't use advanced encoding (e.g. Japanese characters) can save build size with this.
+  # exclude_encoding # Applications that don't use advanced encoding (e.g. Japanese characters) can save build size with this.
   verbose
 
   add_build :windows_folder do
     icon "media/icon.ico"
-    executable_type :console # Assuming you don't want it to run with a console window.
+    executable_type :windows # Assuming you don't want it to run with a console window.
     add_package :exe # Windows self-extracting archive.
   end
 end

lib/pages/editor.rb

@@ -6,6 +6,18 @@ module TAC
         @active_group = nil
         @active_action = nil
 
+        @scroll_into_view_list = []
+        @highlight_item_container = nil
+        @highlight_from_color = Gosu::Color.rgba(0, 0, 0, 0)
+        @highlight_to_color = Gosu::Color.rgba(THEME_HIGHLIGHTED_COLOR.red, THEME_HIGHLIGHTED_COLOR.green, THEME_HIGHLIGHTED_COLOR.blue, 200)
+
+        @highlight_animator = CyberarmEngine::Animator.new(
+          start_time: Gosu.milliseconds - 1,
+          duration: 0,
+          from: Gosu::Color.rgba(0, 0, 0, 0),
+          to: THEME_HIGHLIGHTED_COLOR
+        )
+
         menu_bar.clear do
           if @options[:group_is_preset]
             title "Editing group preset: #{@options[:group].name}"
@@ -213,20 +225,33 @@ module TAC
           @active_group = @options[:group]
           @active_group_label.value = @active_group.name
 
+          if @options[:action]
+            @active_action = @options[:action]
+            @active_action_label.value = @active_action.name
+          end
+
           populate_groups_list
           populate_actions_list(@active_group)
+          populate_variables_list(@active_action) if @active_action
 
           @groups_menu.hide
 
+          scroll_into_view(@active_group)
+          scroll_into_view(@active_action) if @active_action
+          scroll_into_view(@options[:variable]) if @options[:variable]
+
         elsif @options[:action_is_preset]
           @active_action = @options[:action]
           @active_action_label.value = @active_action.name
 
-          populate_variables_list(@options[:action])
+          populate_variables_list(@active_action)
 
           @groups_menu.hide
           @actions_menu.hide
 
+          scroll_into_view(@active_action)
+          scroll_into_view(@options[:variable]) if @options[:variable]
+
         else
           if @options[:group]
             populated_groups_list = true
@@ -237,6 +262,8 @@ module TAC
             populate_groups_list
             populate_actions_list(@active_group) unless @options[:action]
 
+            scroll_into_view(@active_group)
+
             if @options[:action]
               @active_action = @options[:action]
               @active_action_label.value = @active_action.name
@@ -245,9 +272,8 @@ module TAC
 
               populate_variables_list(@active_action)
 
-              if @options[:variable]
+              scroll_into_view(@active_action)
-                # Scroll into view?
+              scroll_into_view(@options[:variable]) if @options[:variable]
-              end
             end
           end
         end
@@ -463,8 +489,7 @@ module TAC
 
         item_container = find_element_by_tag(list_container, item.name)
 
-        @scroll_into_view_list_container = list_container
+        @scroll_into_view_list << { list: list_container, item: item_container }
-        @scroll_into_view_item_container = item_container
       end
 
       def populate_groups_list
@@ -597,25 +622,49 @@ module TAC
         end
       end
 
+      def draw
+        super
+
+        unless @highlight_animator.complete?
+          item = @highlight_item_container
+
+          Gosu.draw_rect(
+            item.x, item.y,
+            item.width, item.height,
+            @highlight_animator.color_transition,
+            item.z + 1
+          )
+        end
+      end
+
       def update
         super
 
-        list_container = @scroll_into_view_list_container
+        current_state.request_repaint unless @highlight_animator.complete?
-        item_container = @scroll_into_view_item_container
+
+        while (hash = @scroll_into_view_list.shift)
+          list_container = hash[:list]
+          item_container = hash[:item]
 
           return unless list_container
           return unless item_container
 
-        unless item_container.x.between?(list_container.x, list_container.x + list_container.width) &&
+          unless (item_container.y + item_container.height).between?(list_container.y, list_container.y + list_container.height)
-          item_container.y.between?(list_container.y, list_container.y + list_container.height)
 
-          list_container.scroll_top = (item_container.y + item_container.height) - item_container.height
+            list_container.scroll_top = (item_container.y + item_container.height) - (list_container.y + list_container.height)
 
             list_container.recalculate
           end
 
-        @scroll_into_view_list_container = nil
+          @highlight_item_container = item_container
-        @scroll_into_view_item_container = nil
+          @highlight_animator = CyberarmEngine::Animator.new(
+            start_time: Gosu.milliseconds,
+            duration: 750,
+            from: @highlight_from_color,
+            to: @highlight_to_color,
+            tween: :ease_in_out_back
+          )
+        end
       end
 
       def button_down(id)

lib/pages/field_planner.rb

@@ -80,12 +80,15 @@ module TAC
         @segment_thickness = 2
 
         @font = CyberarmEngine::Text.new(font: THEME_BOLD_FONT, size: 18, border: true, static: true)
+        @last_mouse_position = CyberarmEngine::Vector.new(window.mouse_x, window.mouse_y)
 
         measure_path
         refresh_panel
       end
 
       def draw
+        super
+
         @field.draw
 
         display_path
@@ -105,15 +108,19 @@ module TAC
             @font.width + 12,
             @font.height + 12,
             0xaa_000000,
-            100_000)
+            100_000
+          )
 
           @font.draw
-
         end
-
       end
 
       def update
+        super
+
+        current_state.request_repaint if window.mouse_x != @last_mouse_position.x || window.mouse_y != @last_mouse_position.y
+        @last_mouse_position = CyberarmEngine::Vector.new(window.mouse_x, window.mouse_y)
+
         @field.update
 
         measure_path

lib/pages/presets.rb

@@ -19,21 +19,106 @@ module TAC
           end
         end
 
+        @scroll_into_view_list = []
+        @highlight_item_container = nil
+        @highlight_from_color = Gosu::Color.rgba(0, 0, 0, 0)
+        @highlight_to_color = Gosu::Color.rgba(THEME_HIGHLIGHTED_COLOR.red, THEME_HIGHLIGHTED_COLOR.green, THEME_HIGHLIGHTED_COLOR.blue, 200)
+
+        @highlight_animator = CyberarmEngine::Animator.new(
+          start_time: Gosu.milliseconds - 1,
+          duration: 0,
+          from: Gosu::Color.rgba(0, 0, 0, 0),
+          to: THEME_HIGHLIGHTED_COLOR
+        )
+
         populate_group_presets
         populate_action_presets
       end
 
-      def populate_group_presets
+      def draw
-        @group_presets.clear do
+        super
-          window.backend.config.presets.groups.each_with_index do |group, i|
-            flow(width: 1.0, height: 36, **THEME_ITEM_CONTAINER_PADDING) do
-              background i.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR
 
-              button group.name, fill: true, text_size: THEME_ICON_SIZE - 3 do
+        unless @highlight_animator.complete?
+          item = @highlight_item_container
+
+          Gosu.draw_rect(
+            item.x, item.y,
+            item.width, item.height,
+            @highlight_animator.color_transition,
+            item.z + 1
+          )
+        end
+      end
+
+      def update
+        super
+
+        current_state.request_repaint unless @highlight_animator.complete?
+
+        while (hash = @scroll_into_view_list.shift)
+          list_container = hash[:list]
+          item_container = hash[:item]
+
+          return unless list_container
+          return unless item_container
+
+          unless (item_container.y + item_container.height).between?(list_container.y, list_container.y + list_container.height)
+
+            list_container.scroll_top = (item_container.y + item_container.height) - (list_container.y + list_container.height)
+
+            list_container.recalculate
+          end
+
+          @highlight_item_container = item_container
+          @highlight_animator = CyberarmEngine::Animator.new(
+            start_time: Gosu.milliseconds,
+            duration: 750,
+            from: @highlight_from_color,
+            to: @highlight_to_color,
+            tween: :ease_in_out_back
+          )
+        end
+      end
+
+      def update_list_children(list)
+        list.children.sort_by! { |i| i.style.tag.downcase }
+
+        list.children.each_with_index do |child, i|
+          child.style.default[:background] = i.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR
+
+          child.root.gui_state.request_recalculate
+        end
+      end
+
+      def scroll_into_view(item)
+        list_container = nil
+        item_container = nil
+
+        if item.is_a?(TAC::Config::Group)
+          list_container = @group_presets
+        elsif item.is_a?(TAC::Config::Action)
+          list_container = @action_presets
+        else
+          raise "Unsupported item type: #{item.class}"
+        end
+
+        item_container = find_element_by_tag(list_container, item.name)
+
+        @scroll_into_view_list << { list: list_container, item: item_container }
+      end
+
+      def add_group_container(group)
+        index = window.backend.config.presets.groups.index(group)
+
+        flow width: 1.0, height: 36, **THEME_ITEM_CONTAINER_PADDING, tag: group.name do |container|
+          background group == @active_group ? THEME_HIGHLIGHTED_COLOR : (index.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR)
+          @active_group_container = container if group == @active_group
+
+          button group.name, fill: true, text_size: THEME_ICON_SIZE - 3, tag: "label" do
             page(TAC::Pages::Editor, { group: group, group_is_preset: true })
           end
 
-              button get_image("#{TAC::ROOT_PATH}/media/icons/gear.png"), image_width: THEME_ICON_SIZE, tip: "Edit group preset" do
+          button get_image("#{TAC::ROOT_PATH}/media/icons/gear.png"), image_width: THEME_ICON_SIZE, tip: "Edit group" do
             push_state(
               Dialog::NamePromptDialog,
               title: "Rename Group Preset",
@@ -43,7 +128,7 @@ module TAC
             )
           end
 
-              button get_image("#{TAC::ROOT_PATH}/media/icons/trashcan.png"), image_width: THEME_ICON_SIZE, tip: "Delete group preset", **THEME_DANGER_BUTTON do
+          button get_image("#{TAC::ROOT_PATH}/media/icons/trashcan.png"), image_width: THEME_ICON_SIZE, tip: "Delete group", **THEME_DANGER_BUTTON do
             push_state(
               Dialog::ConfirmDialog,
               title: "Are you sure?",
@@ -53,30 +138,30 @@ module TAC
           end
         end
       end
-        end
-      end
 
-      def populate_action_presets
+      def add_action_container(action)
-        @action_presets.clear do
+        index = window.backend.config.presets.actions.index(action)
-          window.backend.config.presets.actions.each_with_index do |action, i|
-            flow(width: 1.0, height: 36, **THEME_ITEM_CONTAINER_PADDING) do
-              background i.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR
 
-              button action.name, fill: true, text_size: THEME_ICON_SIZE - 3 do
+        stack width: 1.0, height: action.comment.empty? ? 36 : 72, **THEME_ITEM_CONTAINER_PADDING, tag: action.name do |container|
+          background action == @active_action ? THEME_HIGHLIGHTED_COLOR : (index.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR)
+          @active_action_container = container if action == @active_action
+
+          flow width: 1.0, height: 36 do
+            button action.name, fill: true, text_size: THEME_ICON_SIZE - 3, tag: "label" do
               page(TAC::Pages::Editor, { action: action, action_is_preset: true })
             end
 
-              button get_image("#{TAC::ROOT_PATH}/media/icons/gear.png"), image_width: THEME_ICON_SIZE, tip: "Edit action preset" do
+            button get_image("#{TAC::ROOT_PATH}/media/icons/gear.png"), image_width: THEME_ICON_SIZE, tip: "Edit action" do
               push_state(
-                  Dialog::NamePromptDialog,
+                Dialog::ActionDialog,
-                  title: "Rename Action Preset",
+                title: "Edit Action Preset",
-                  renaming: action,
+                action: action,
                 list: window.backend.config.presets.actions,
                 callback_method: method(:update_action_preset)
               )
             end
 
-              button get_image("#{TAC::ROOT_PATH}/media/icons/trashcan.png"), image_width: THEME_ICON_SIZE, tip: "Delete action preset", **THEME_DANGER_BUTTON do
+            button get_image("#{TAC::ROOT_PATH}/media/icons/trashcan.png"), image_width: THEME_ICON_SIZE, tip: "Delete action", **THEME_DANGER_BUTTON do
               push_state(
                 Dialog::ConfirmDialog,
                 title: "Are you sure?",
@@ -85,16 +170,46 @@ module TAC
               )
             end
           end
+
+          stack(width: 1.0, fill: true, scroll: true, visible: !action.comment.empty?, tag: "comment_container") do
+            caption action.comment.to_s, width: 1.0, text_wrap: :word_wrap, text_border: true, text_border_size: 1, text_border_color: 0xaa_000000, tag: "comment"
+          end
+        end
+      end
+
+      def populate_group_presets
+        @group_presets.clear do
+          window.backend.config.presets.groups.each do |group|
+            add_group_container(group)
+          end
+        end
+      end
+
+      def populate_action_presets
+        @action_presets.clear do
+          window.backend.config.presets.actions.each do |action|
+            add_action_container(action)
           end
         end
       end
 
       def update_group_preset(group, name)
+        old_name = group.name
+
         group.name = name
         window.backend.config.presets.groups.sort_by! { |g| g.name.downcase }
         window.backend.config_changed!
 
-        populate_group_presets
+        group_container = find_element_by_tag(@group_presets, old_name)
+        label = find_element_by_tag(group_container, "label")
+
+        label.value = name
+
+        group_container.style.tag = name
+
+        update_list_children(@group_presets)
+
+        scroll_into_view(group)
       end
 
       def delete_group_preset(group)
@@ -102,15 +217,42 @@ module TAC
         window.backend.config.presets.groups.sort_by! { |g| g.name.downcase }
         window.backend.config_changed!
 
-        populate_group_presets
+        # Remove deleted action from list
+        container = find_element_by_tag(@group_presets, group.name)
+        @group_presets.remove(container)
+
+        update_list_children(@group_presets)
       end
 
-      def update_action_preset(action, name)
+      def update_action_preset(action, name, comment)
+        old_name = action.name
+
         action.name = name
+        action.comment = comment
         window.backend.config.presets.actions.sort_by! { |a| a.name.downcase }
         window.backend.config_changed!
 
-        populate_action_presets
+        action_container = find_element_by_tag(@action_presets, old_name)
+        label = find_element_by_tag(action_container, "label")
+        comment_container = find_element_by_tag(action_container, "comment_container")
+        comment_label = find_element_by_tag(action_container, "comment")
+
+        label.value = name
+        if comment.empty?
+          action_container.style.height = 36
+          comment_container.hide
+          comment_label.value = ""
+        else
+          action_container.style.height = 72
+          comment_container.show
+          comment_label.value = comment.to_s
+        end
+
+        action_container.style.tag = name
+
+        update_list_children(@action_presets)
+
+        scroll_into_view(action)
       end
 
       def delete_action_preset(action)
@@ -118,7 +260,11 @@ module TAC
         window.backend.config.presets.actions.sort_by! { |a| a.name.downcase }
         window.backend.config_changed!
 
-        populate_action_presets
+        # Remove deleted action from list
+        container = find_element_by_tag(@action_presets, action.name)
+        @action_presets.remove(container)
+
+        update_list_children(@action_presets)
       end
     end
   end

lib/pages/search.rb

@@ -22,7 +22,7 @@ module TAC
                 shared_index = 0
 
                 flow(width: 1.0, height: 1.0) do
-                  stack(width: 0.495, height: 1.0, scroll: true) do
+                  stack(fill: true, height: 1.0, scroll: true, padding: 20, padding_right: 10) do
                     if search_results.groups.size.positive?
                       title "Groups"
 
@@ -44,7 +44,9 @@ module TAC
                       search_results.actions.each do |result|
                         stack(width: 1.0, **THEME_ITEM_CONTAINER_PADDING) do
                           background shared_index.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR
-                          button result.highlight(result.action.name), width: 1.0 do
+                          tip = "Group: #{result.group.name}"
+
+                          button result.highlight(result.action.name), width: 1.0, tip: tip do
                             page(TAC::Pages::Editor, { group: result.group, action: result.action, is_search: true })
                           end
 
@@ -63,7 +65,9 @@ module TAC
                       search_results.variables.each do |result|
                         stack(width: 1.0, **THEME_ITEM_CONTAINER_PADDING) do
                           background shared_index.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR
-                          button "#{result.highlight(result.variable.name)} [#{result.highlight(result.variable.value)}]", width: 1.0 do
+                          tip = "Group: #{result.group.name}, Action: #{result.action.name}"
+
+                          button "#{result.highlight(result.variable.name)} [#{result.variable.type}: #{result.highlight(result.variable.value)}]", width: 1.0, tip: tip do
                             page(TAC::Pages::Editor, { group: result.group, action: result.action, variable: result.variable, is_search: true })
                           end
                         end
@@ -73,13 +77,14 @@ module TAC
                     end
                   end
 
-                  stack(width: 0.495, height: 1.0, scroll: true) do
+                  stack(fill: true, height: 1.0, scroll: true, padding: 20, padding_left: 10) do
                     if search_results.group_presets.size.positive?
                       title "Group Presets"
 
                       search_results.group_presets.each do |result|
                         stack(width: 1.0, **THEME_ITEM_CONTAINER_PADDING) do
                           background shared_index.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR
+
                           button result.highlight(result.group.name), width: 1.0 do
                             page(TAC::Pages::Editor, { group: result.group, group_is_preset: true, is_search: true })
                           end
@@ -95,7 +100,9 @@ module TAC
                       search_results.action_presets.each do |result|
                         stack(width: 1.0, **THEME_ITEM_CONTAINER_PADDING) do
                           background shared_index.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR
-                          button result.highlight(result.action.name), width: 1.0 do
+                          tip = result.group ? "Group: #{result.group.name}" : nil
+
+                          button result.highlight(result.action.name), width: 1.0, tip: tip do
                             if result.group.nil?
                               page(TAC::Pages::Editor, { action: result.action, action_is_preset: true, is_search: true })
                             else
@@ -118,7 +125,9 @@ module TAC
                       search_results.variables_from_presets.each do |result|
                         stack(width: 1.0, **THEME_ITEM_CONTAINER_PADDING) do
                           background shared_index.even? ? THEME_EVEN_COLOR : THEME_ODD_COLOR
-                          button "#{result.highlight(result.variable.name)} [#{result.highlight(result.variable.value)}]", width: 1.0 do
+                          tip = result.group ? "Group: #{result.group.name}, Action: #{result.action.name}" : "Action: #{result.action.name}"
+
+                          button "#{result.highlight(result.variable.name)} [#{result.variable.type}: #{result.highlight(result.variable.value)}]", width: 1.0, tip: tip do
                             if result.group.nil?
                               page(TAC::Pages::Editor, { action: result.action, variable: result.variable, action_is_preset: true, is_search: true })
                             else

lib/version.rb

@@ -1,5 +1,5 @@
 module TAC
   NAME = "TimeCrafters Configuration Tool"
-  VERSION = "0.6.0"
+  VERSION = "0.7.2"
   RELEASE_NAME = "Beta"
 end