Merge pull request #2885 from HelioGuilherme66/fix_scroll_grid

Improve scroll grid for non-Linux systems

README.adoc

@@ -40,7 +40,7 @@ Likewise, the current version of wxPython, is 4.2.1, but RIDE is known to work w
 
 `pip install -U robotframework-ride`
 
-(3.8 <= python <= 3.12) Install current development version (**2.1dev78**) with:
+(3.8 <= python <= 3.12) Install current development version (**2.1dev79**) with:
 
 `pip install -U https://github.com/robotframework/RIDE/archive/master.zip`
 

src/robotide/application/releasenotes.py

@@ -328,7 +328,7 @@ def set_content(self, html_win, content):
 <pre class="literal-block">
 python -m robotide.postinstall -install
 </pre>
-<p>RIDE {VERSION} was released on 08/September/2024.</p>
+<p>RIDE {VERSION} was released on 16/September/2024.</p>
 <!-- <br/>
 <h3>May The Fourth Be With You!</h3>
 <h3>Celebrate the bank holiday, 10th June, Day of Portugal, Portuguese Communities and Camões!!</h3>

src/robotide/editor/editors.py

@@ -104,6 +104,8 @@ def __init__(self, plugin, parent, controller, tree):
         self._editors = []
         self._last_shown_tooltip = None
         self._reset_last_show_tooltip()
+        if context.IS_LINUX:
+            self.SetupScrolling()  # Only Linux users will need to use the workaround to restore Grid scroll bars
         self._populate()
         self.plugin.subscribe(self._settings_changed, RideItemSettingsChanged)
 
@@ -314,7 +316,6 @@ def __init__(self, *args):
         _RobotTableEditor.__init__(self, *args)
         self.plugin.subscribe(
             self._update_source_and_name, RideFileNameChanged)
-        self.SetupScrolling()
 
     def _update_source(self, message=None):
         _ = message

src/robotide/lib/robot/parsing/robotreader.py

@@ -93,7 +93,9 @@ def sharp_strip(self, line):
                 no_spc = 0
         spc_row = []
         for r in row:
-            spc_row.extend(r.split(max(2, self._spaces) * ' '))
+            # spc_row.extend(r.split(max(2, self._spaces) * ' '))
+            cells = r.split('  ')  # Use two spaces, because some settings could be lost
+            spc_row.extend(cells)
             # spc_row.extend(self._space_splitter.split(r))
         # Remove empty cells after first identation or content
         content = False

src/robotide/namespace/cache.py

@@ -188,6 +188,7 @@ def _build_default_kws(self):
             robot_version = b'7.0.1'
         try:
             rbt_version = int(str(robot_version, encoding='UTF-8').replace('.', ''))
+            rbt_version = rbt_version if rbt_version > 99 else rbt_version * 10
         except ValueError:
             rbt_version = 701
         var_note = "*NOTE:* This marker exists since version 7.0" + (f" and is an error to use because your "

src/robotide/version.py

@@ -15,4 +15,4 @@
 #
 # Automatically generated by `tasks.py`.
 
-VERSION = 'v2.1dev78'
+VERSION = 'v2.1dev79'