Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to http://semver.org/spec/v2.0.0.html[Semantic Versioni
== https://github.com/robotframework/RIDE[Unreleased]

=== Fixed
- Fixed extra scrolling bars in Grid Editor.
- Fixed broken directory selection dialog when opening Test Suite directory on first RIDE execution after install.
- Fixed disappering Project Explorer tree elements, after editing directory elements (i.e. variable or keyword).
- Fixed blank Project Explorer panel when docking. Long time existing issue.
Expand Down
2 changes: 1 addition & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Likewise, the current version of wxPython, is 4.2.5, but RIDE is known to work w

`pip install -U robotframework-ride`

(3.9 <= python <= 3.14) Install current development version (**2.2.5dev10**) with:
(3.9 <= python <= 3.14) Install current development version (**2.2.5dev11**) with:

`pip install -U https://github.com/robotframework/RIDE/archive/develop.zip`

Expand Down
2 changes: 2 additions & 0 deletions src/robotide/application/CHANGELOG.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Changelog</title><link rel="stylesheet" type="text/css" href="docbook-xsl.css" /><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot" /></head><body><div xml:lang="en" class="article" lang="en"><div class="titlepage"><div><div><h2 class="title"><a id="id1337">_</a>Changelog</h2></div></div><hr /></div><p>All notable changes to this project will be documented in this file.</p><p>The format is based on <a class="ulink" href="http://keepachangelog.com/en/1.0.0/" target="_top">Keep a Changelog</a>
and this project adheres to <a class="ulink" href="http://semver.org/spec/v2.0.0.html" target="_top">Semantic Versioning</a>.</p><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_ulink_url_https_github_com_robotframework_ride_unreleased_ulink">_</a>1. <a class="ulink" href="https://github.com/robotframework/RIDE" target="_top">Unreleased</a></h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_fixed">_</a>1.1. Fixed</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
Fixed extra scrolling bars in Grid Editor.
</li><li class="listitem">
Fixed broken directory selection dialog when opening Test Suite directory on first RIDE execution after install.
</li><li class="listitem">
Fixed disappering Project Explorer tree elements, after editing directory elements (i.e. variable or keyword).
Expand Down
1 change: 1 addition & 0 deletions src/robotide/application/releasenotes.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ def set_content(self, html_win, content):
</ul>
<p><strong>New Features and Fixes Highlights</strong></p>
<ul class="simple">
<li>Fixed extra scrolling bars in Grid Editor.</li>
<li>Fixed broken directory selection dialog when opening Test Suite directory on first RIDE execution after install.</li>
<li>Fixed disappering Project Explorer tree elements, after editing directory elements (i.e. variable or keyword).</li>
<li>Fixed blank Project Explorer panel when docking. Long time existing issue.</li>
Expand Down
4 changes: 2 additions & 2 deletions src/robotide/editor/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,10 @@ def on_file_deleted(self, message):
self._create_editor()


class _EditorTab(wx.ScrolledWindow):
class _EditorTab(wx.Panel):

def __init__(self, plugin):
wx.ScrolledWindow.__init__(self, plugin.notebook, style=wx.SUNKEN_BORDER)
wx.Panel.__init__(self, parent=plugin.notebook, style=wx.SUNKEN_BORDER)
self.plugin = plugin
self.sizer = wx.BoxSizer(wx.VERTICAL)
self.SetSizer(self.sizer)
Expand Down
2 changes: 1 addition & 1 deletion src/robotide/editor/editors.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ def _collabsible_changed(self, event=None):
self.EnableScrolling(True, True)
self.Refresh()
self.Parent.GetSizer().Layout()
self.Parent.EnableScrolling(True, True)
# self.Parent.EnableScrolling(True, True)
self.Parent.Refresh()
if event:
event.Skip()
Expand Down
26 changes: 16 additions & 10 deletions src/robotide/ui/mainframe.py
Original file line number Diff line number Diff line change
Expand Up @@ -296,19 +296,25 @@ def _init_ui(self):
"""
# DEBUG: self.leftpanel = wx.Panel(self, name="left_panel", size = (275, 250))
if new_ui: # Only when creating UI we add panes
# Tree is always created here
self.tree = Tree(self, self.actions, self._application.settings)
# Tree is always created here, inside a plain panel. AUI must manage the holder and
# never the Tree itself: docking a floating pane reparents the managed window, and a
# reparented wx.ScrolledWindow (which CustomTreeCtrl is) stops receiving paint events
# on wxGTK, leaving a correctly sized but permanently blank panel. The Files pane uses
# the same idiom (FileExplorer is a wx.Panel wrapping its tree_ctrl).
self.tree_holder = wx.Panel(self)
self.tree = Tree(self.tree_holder, self.actions, self._application.settings)
self.tree.SetMinSize(wx.Size(275, 250))
self.tree.SetFont(wx.Font(self.fontinfo))
# self.leftpanel.Bind(wx.EVT_SIZE, self.tree.OnSize)
# self.aui_mgr.AddPane(self.leftpanel, aui.AuiPaneInfo().Name("left_panel").Caption("left_panel").Left())
tree_sizer = wx.BoxSizer(wx.VERTICAL)
tree_sizer.Add(self.tree, 1, wx.EXPAND)
self.tree_holder.SetSizer(tree_sizer)
self.tree_holder.SetMinSize(wx.Size(275, 250))
# DEBUG: Next was already called from application.py
# print(f"DEBUG: mainframe.py RideFrame NEW UI tree caption {_('Test Suites')}")
self.aui_mgr.AddPane(self.tree,
self.aui_mgr.AddPane(self.tree_holder,
aui.AuiPaneInfo().Name("tree_content").Caption(_('Test Suites')).CloseButton(True)
.LeftDockable(True)
) # DEBUG: remove .CloseButton(False) when restore is fixed
# DEBUG: self.aui_mgr.GetPane(self.tree).DestroyOnClose()
# TreePlugin will manage showing the Tree
self.actions.register_actions(action_info_collection(_menudata, self, data_nt=self._menudata_nt,
container=self.tree))
Expand Down Expand Up @@ -502,14 +508,16 @@ def OnFloatDock(self, event):
# panelabel = event.pane.caption
etype = event.GetEventType()
# strs = "Pane %s "%panelabel
# Only the persisted docked/floating state is recorded here. The tree keeps its nodes and
# repaints by itself across the transition, so rebuilding it would just discard the current
# selection; and calling into the AUI manager from these events re-enters its own drag
# handling.
if etype == aui.wxEVT_AUI_PANE_FLOATING:
# strs += "is about to be floated"
if event.pane.name == "file_manager":
self.filemgr.update_tree()
elif event.pane.name == "tree_content":
self._application.treeplugin.set_float_docked(False)
self._application.treeplugin.on_show_tree(None)
self.tree.refresh_view()
# elif etype == aui.wxEVT_AUI_PANE_FLOATED:
# strs += "has been floated"
elif etype == aui.wxEVT_AUI_PANE_DOCKING:
Expand All @@ -518,8 +526,6 @@ def OnFloatDock(self, event):
self.filemgr.update_tree()
elif event.pane.name == "tree_content":
self._application.treeplugin.set_float_docked(True)
self._application.treeplugin.on_show_tree(None)
self.tree.refresh_view()
# elif etype == aui.wxEVT_AUI_PANE_DOCKED:
# strs += "has been docked"
# print("DEBUG: " + strs + "\n")
Expand Down
2 changes: 1 addition & 1 deletion src/robotide/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
#
# Automatically generated by `tasks.py`.

VERSION = 'v2.2.5dev10'
VERSION = 'v2.2.5dev11'

Loading