wxruby3 0.9.0.pre.beta.8 → 0.9.0.pre.beta.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5dbc9b814f9b51ac36a537fad27a58595d41536f68eafb17b7250b70b510d2f
-  data.tar.gz: bd80ce942bd3e37ee334d5562a7fcc4462e640ced3b49449e68e7c9e12f7c784
+  metadata.gz: ce9e7bb6763fb08e50024b77b709a9cc94032933960dbdaee1b3a5f90acad71d
+  data.tar.gz: 3d39f6499828d222e038a1bd4880af58befe24f887d2d73534213107f024bf46
 SHA512:
-  metadata.gz: 640e90f61107db26bf3f73e76fd5cc05843cc714621773bb807c6f14a4e93b911bb3a92e54f430644843d9c0d986cf8041d9b9ab7750f09f69dbb4517ea8a982
-  data.tar.gz: 5ce36f28a19449a0fd3f20ed5a8133b490335e359f13bb118c325c5592a65f75881f02970a2270699af7d64338d0f06d409d01bd26d4a67c61ed3685d9b71f92
+  metadata.gz: a2a56a03af8da3b6fe6dc57192cf151218cd6f6bf2dca613cdfccae1851451fc7ecb75080cb530050e30f438bee6c8990106795218e6cc5601a033517b92b445
+  data.tar.gz: 02b8069fda0d2c3a0237747650f081b1824787d72c9aaad98ce8ef78cbd6cb5a1752bda5e98539ba092bc786854b86e26141fa935c3cd58817290931d0f7c836

data/lib/wx/version.rb

@@ -1,3 +1,3 @@
 module Wx
-  WXRUBY_VERSION    = '0.9.0-beta.8'
+  WXRUBY_VERSION    = '0.9.0-beta.9'
 end

data/samples/sampler/editor.rb

@@ -175,6 +175,19 @@ module WxRuby
       @editors.each { |e| e.find_close }
     end
 
+    def goto
+      res = Wx.get_number_from_user('Enter line number to go to.',
+                                    'Line:',
+                                    'Goto Line',
+                                    @editors[@edt_book.selection].current_line+1,
+                                    1,
+                                    @editors[@edt_book.selection].line_count,
+                                    @frame)
+      if res >= 1
+        @editors[@edt_book.selection].goto_line(res-1)
+      end
+    end
+
     def page_from_id(id)
       if id >= ID::EDT_MIN_ID && id < (ID::EDT_MIN_ID+@edt_book.page_count)
         id - ID::EDT_MIN_ID
@@ -231,6 +244,7 @@ module WxRuby
       FIND_NEXT = Wx::ID_FORWARD
       FIND_PREV = Wx::ID_BACKWARD
       REPLACE = Wx::ID_REPLACE
+      GOTO = Wx::ID_JUMP_TO
       %i[
         RUN
         TOGGLE_THEME
@@ -268,6 +282,8 @@ module WxRuby
       menuEdit.append(ID::FIND_NEXT, "Find Next\tF3", 'Find next occurrence of the search phrase')
       menuEdit.append(ID::FIND_PREV, "Find Previous\tShift-F3", 'Find previous occurrence of the search phrase')
       menuEdit.append(ID::REPLACE, "Replace...\tCtrl-R", 'Show Replace Dialog')
+      menuEdit.append_separator
+      menuEdit.append(ID::GOTO, "Got to line...\tCtrl-G", 'Move to line number')
 
       menuView = Wx::Menu.new
       menuView.append(ID::TOGGLE_THEME, 'Display dark theme', 'Display dark theme', Wx::ITEM_CHECK)
@@ -354,6 +370,8 @@ module WxRuby
       evt_menu(ID::FIND_NEXT, :on_find_next)
       evt_menu(ID::FIND_PREV, :on_find_prev)
 
+      evt_menu(ID::GOTO, :on_goto)
+
       layout
     end
 
@@ -555,6 +573,10 @@ module WxRuby
       set_status_text('')
     end
 
+    def on_goto(_evt)
+      @editors.goto
+    end
+
   end
 
 end

data/samples/sampler/stc_editor.rb

@@ -133,17 +133,18 @@ module WxRuby
       style_set_foreground(SCE_RB_CHARACTER, Wx::RED)
       style_set_foreground(SCE_RB_SYMBOL, Wx::Colour.new('DARKBLUE'))
       style_set_bold(SCE_RB_SYMBOL, true)
-      # current wxWidgets Scintilla (Ruby lexer) version does not support these correctly
-      # style_set_foreground(SCE_RB_HERE_DELIM, Wx::BLACK)
-      # style_set_bold(SCE_RB_HERE_DELIM, true)
-      # style_set_foreground(SCE_RB_HERE_Q, c_maroon)
-      # style_set_foreground(SCE_RB_HERE_QQ, c_maroon)
-      # style_set_foreground(SCE_RB_HERE_QX, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_Q, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QQ, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QX, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QR, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QW, c_maroon)
+      if Wx::WXWIDGETS_VERSION >= '3.3.0'
+        style_set_foreground(SCE_RB_HERE_DELIM, Wx::BLACK)
+        style_set_bold(SCE_RB_HERE_DELIM, true)
+        style_set_foreground(SCE_RB_HERE_Q, c_maroon)
+        style_set_foreground(SCE_RB_HERE_QQ, c_maroon)
+        style_set_foreground(SCE_RB_HERE_QX, c_maroon)
+        style_set_foreground(SCE_RB_STRING_Q, c_maroon)
+        style_set_foreground(SCE_RB_STRING_QQ, c_maroon)
+        style_set_foreground(SCE_RB_STRING_QX, c_maroon)
+        style_set_foreground(SCE_RB_STRING_QR, c_maroon)
+        style_set_foreground(SCE_RB_STRING_QW, c_maroon)
+      end
       bg = Wx::Colour.new('LightGray')
       fg = Wx::Colour.new('DarkCyan')
       set_fold_margin_colour(true, bg)
@@ -156,6 +157,7 @@ module WxRuby
 
     def dark_theme
       bg = Wx::Colour.new('DarkSlateGray')
+      c_str = Wx::Colour.new('LimeGreen')
       style_set_background(Wx::STC::STC_STYLE_DEFAULT, bg)
       style_set_foreground(Wx::STC::STC_STYLE_DEFAULT, Wx::WHITE)
       style_clear_all
@@ -177,24 +179,25 @@ module WxRuby
       style_set_background(SCE_RB_POD, bg)
       style_set_foreground(SCE_RB_NUMBER, Wx::Colour.new('DeepSkyBlue'))
       style_set_background(SCE_RB_NUMBER, bg)
-      style_set_foreground(SCE_RB_STRING, Wx::Colour.new('LimeGreen'))
+      style_set_foreground(SCE_RB_STRING, c_str)
       style_set_background(SCE_RB_STRING, bg)
       style_set_foreground(SCE_RB_CHARACTER, Wx::Colour.new('YellowGreen'))
       style_set_background(SCE_RB_CHARACTER, bg)
       style_set_foreground(SCE_RB_SYMBOL, Wx::Colour.new('Gold'))
       style_set_background(SCE_RB_SYMBOL, bg)
       style_set_bold(SCE_RB_SYMBOL, true)
-      # current wxWidgets Scintilla (Ruby lexer) version does not support these correctly
-      # style_set_foreground(SCE_RB_HERE_DELIM, Wx::BLACK)
-      # style_set_bold(SCE_RB_HERE_DELIM, true)
-      # style_set_foreground(SCE_RB_HERE_Q, c_maroon)
-      # style_set_foreground(SCE_RB_HERE_QQ, c_maroon)
-      # style_set_foreground(SCE_RB_HERE_QX, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_Q, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QQ, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QX, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QR, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QW, c_maroon)
+      if Wx::WXWIDGETS_VERSION >= '3.3.0'
+        style_set_foreground(SCE_RB_HERE_DELIM, Wx::Colour.new('Chocolate'))
+        style_set_bold(SCE_RB_HERE_DELIM, true)
+        style_set_foreground(SCE_RB_HERE_Q, c_str)
+        style_set_foreground(SCE_RB_HERE_QQ, c_str)
+        style_set_foreground(SCE_RB_HERE_QX, c_str)
+        style_set_foreground(SCE_RB_STRING_Q, c_str)
+        style_set_foreground(SCE_RB_STRING_QQ, c_str)
+        style_set_foreground(SCE_RB_STRING_QX, c_str)
+        style_set_foreground(SCE_RB_STRING_QR, c_str)
+        style_set_foreground(SCE_RB_STRING_QW, c_str)
+      end
       bg = Wx::Colour.new('CadetBlue')
       fg = Wx::Colour.new('Chocolate')
       set_fold_margin_colour(true, bg)
@@ -212,7 +215,7 @@ module WxRuby
         start_pos = current_pos
         end_pos = length-1
       else
-        start_pos = current_pos
+        start_pos = [0, current_pos - (@search_indicator ? @search_indicator.last : 0)].max
         end_pos = 0
       end
       pos, end_pos = find_text(start_pos, end_pos, txt, flags)

data/samples/sampler/txt_editor.rb

@@ -45,6 +45,24 @@ module WxRuby
       clear
     end
 
+    def get_line_count
+      number_of_lines
+    end
+    alias :line_count :get_line_count
+
+    def get_current_line
+      pos = insertion_point
+      _, line = position_to_xy(pos)
+      line
+    end
+    alias :current_line :get_current_line
+
+    def goto_line(line)
+      pos = xy_to_position(0, line)
+      self.show_position(pos)
+      self.insertion_point = pos
+    end
+
     def do_find(txt, forward, whole_word, match_case)
       options = (match_case ? 0 : Regexp::IGNORECASE)
       pattern = if whole_word
@@ -52,7 +70,12 @@ module WxRuby
                 else
                   ::Regexp.new(txt, options)
                 end
-      forward ? self.value.index(pattern, self.insertion_point) : self.value.rindex(pattern, self.insertion_point)
+      if forward
+        self.value.index(pattern, insertion_point)
+      else
+        start_pos = [0, insertion_point - (@search_indicator ? @search_indicator.last+1 : 0)].max
+        self.value.rindex(pattern, start_pos)
+      end
     end
 
     def indicator_clear_range(pos, len)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wxruby3
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre.beta.8
+  version: 0.9.0.pre.beta.9
 platform: ruby
 authors:
 - Martin Corino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-27 00:00:00.000000000 Z
+date: 2023-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri