app/src/gambas3/.src/Editor/Form/FToolBox.class

@@ -373,3 +373,10 @@ Public Sub OnProjectActivate()
   tabTool.Index = iIndex
   
 End
+
+Public Sub tabTool_CloseAll()
+
+  Dim hPanel As SidePanel = Me.Parent
+  hPanel.Hidden = True
+
+End

app/src/gambas3/.src/Editor/Form/FToolBox.form

@@ -10,6 +10,7 @@
     Arrangement = Arrange.Fill
     Padding = 2
     Border = False
+    CloseButton = True
     Index = 0
     Text = ("")
     Index = 0

app/src/gambas3/.src/FMain.class

@@ -14,9 +14,6 @@ Private $bUpdateRecentMenu As Boolean
 Private $dRecentMenu As Date
 Private $bInTreeView As Boolean
 Private $bInRename As Boolean
-' Private $bHasJustCollapsed As Boolean
-' Private $bExpandOnMouseUp As Boolean
-' Private $iTreeToolbarRow As Integer
 
 Private frmWelcome As FWelcome
 Private $hCornerNW As Image
@@ -28,7 +25,7 @@ Private $hBorderS As Image
 Private $hBorderW As Image
 Private $hBorderE As Image
 
-'Private $bInOpenExtern As Boolean
+Private $iTabBarHeight As Integer
 
 Static Private $sCompressMessage As String
 
@@ -1143,9 +1140,13 @@ Public Sub ReadConfig()
   
   Project.SetNormalFont(tvwProject)
   tabProperty.TextFont = Project.GetSmallFont()
+  $iTabBarHeight = tabProperty.TextFont.H + Desktop.Scale * 2 - 1
+  'txtSearchProject.H = Container(tabProperty.Children[0]).Children[0].H - 2
+  txtSearchProject.H = $iTabBarHeight
   wrkProject.Font = tabProperty.TextFont
   Me.Menus.Visible = Settings["/ShowMenus", True]
   wrkProject.CloseWithMouse = Settings["/CloseWithMiddleClick", False]
+  UpdateWorkspaceButtons
   
 End
 
@@ -3007,3 +3008,59 @@ End
 '   HideTreeToolbar
 '   
 ' End
+
+Private Sub UpdateWorkspaceButtons()
+
+  If panProject.Hidden And If panProject.Visible Then
+    wrkProject.TabBarPaddingStart = $iTabBarHeight
+    btnWorkspaceProject.Move(If(System.RightToLeft, wrkProject.W - $iTabBarHeight, 0), 0, $iTabBarHeight, $iTabBarHeight)
+    btnWorkspaceProject.Show
+    btnWorkspaceProject.Raise
+  Else
+    wrkProject.TabBarPaddingStart = 0
+    btnWorkspaceProject.Hide
+  Endif
+  
+  If panProperty.Hidden And If panProperty.Visible Then
+    wrkProject.TabBarPaddingEnd = $iTabBarHeight
+    btnWorkspaceProperty.Move(If(System.RightToLeft, 0, wrkProject.W - $iTabBarHeight), 0, $iTabBarHeight, $iTabBarHeight)
+    btnWorkspaceProperty.Show
+    btnWorkspaceProperty.Raise
+  Else
+    wrkProject.TabBarPaddingEnd = 0
+    btnWorkspaceProperty.Hide
+  Endif
+
+End
+
+Public Sub wrkProject_Arrange()
+  
+  UpdateWorkspaceButtons
+  
+End
+
+Private Sub UpdatePropertyButtons()
+
+  If panTool.Hidden And If panTool.Visible Then
+    tabProperty.TabBarPaddingEnd = $iTabBarHeight
+    btnPropertyToolbar.Move(If(System.RightToLeft, 0, tabProperty.W - $iTabBarHeight), 0, $iTabBarHeight, $iTabBarHeight)
+    btnPropertyToolbar.Show
+    btnPropertyToolbar.Raise
+  Else
+    tabProperty.TabBarPaddingEnd = 0
+    btnPropertyToolbar.Hide
+  Endif
+
+End
+
+Public Sub tabProperty_Arrange()
+
+  UpdatePropertyButtons
+
+End
+
+Public Sub btnPropertyToolbar_Click()
+
+  panTool.Hidden = False
+
+End

app/src/gambas3/.src/FMain.form

@@ -1272,14 +1272,14 @@
           Expand = True
           Arrangement = Arrange.Vertical
           { Panel2 HBox
-            MoveScaled(1,2,88,32)
+            MoveScaled(1,1,88,32)
             Expand = True
             { Separator5 Separator
               MoveScaled(1,7,0,10)
               Visible = False
             }
             { wrkProject Workspace
-              MoveScaled(3,1,81,31)
+              MoveScaled(3,3,81,29)
               Background = Color.LightForeground
               Expand = True
               Border = False
@@ -1288,6 +1288,24 @@
               MoveScaled(86,8,0,9)
               Visible = False
             }
+            { btnWorkspaceProperty ToolButton
+              MoveScaled(27,1,4,4)
+              Visible = False
+              ToolTip = ("Properties sheet")
+              Ignore = True
+              Action = "property"
+              Picture = Picture["icon:/small/properties"]
+              Toggle = True
+            }
+            { btnWorkspaceProject ToolButton
+              MoveScaled(22,1,4,4)
+              Visible = False
+              ToolTip = ("Project")
+              Ignore = True
+              Action = "project"
+              Picture = Picture["icon:/small/view-split-h"]
+              Toggle = True
+            }
           }
           { panDebug SidePanel
             MoveScaled(3,37,81,14)
@@ -1342,6 +1360,13 @@
               Text = ("Hierarchy")
               Index = 0
             }
+            { btnPropertyToolbar ToolButton
+              MoveScaled(0,0,4,4)
+              Visible = False
+              ToolTip = ("Properties sheet")
+              Ignore = True
+              Picture = Picture["img/16/control.png"]
+            }
           }
           { panTool SidePanel
             MoveScaled(5,49,21,37)

app/src/gambas3/.src/Help/HelpView.class

@@ -157,6 +157,7 @@ Public Sub WebView_Progress()
       hTimer = New Timer As "TimerUrl"
       hTimer.Trigger
       
+      'Debug Me;; sLastUrl
       Me.Stop
      
     Endif

app/src/gambas3/.src/Project.module

@@ -5261,7 +5261,7 @@ Public Sub OpenWebPage(sLink As String, Optional bNewInstance As Boolean) As Pro
         aTest = ["seamonkey"]
         
       Case "chromium"
-        aTest = ["chromium", "chromium-browser"]
+        aTest = ["chromium", "chromium-browser", "google-chrome-stable"]
 
       Case Else
 

app/src/gambas3/theme/zen

@@ -15,7 +15,7 @@ Breakpoint="#FF5F5F"
 Current="#FF9F3F"
 Selection="#8BDFA0"
 Highlight="#9FFF3F"
-CurrentLine="#CADFC3"
+CurrentLine="#DFF0D9"
 Error="#BF0303,Underline"
 Escape="String,Bold,Dotted"
 Label="Normal,Dotted"

comp/src/gb.form.editor/.component

 [Component]
 Key=gb.form.editor
-Version=3.13.90
+Version=3.14.90
 Needs=Form
 Requires=gb.eval.highlight,gb.util

comp/src/gb.form.editor/.project

@@ -2,7 +2,7 @@
 Title=Text editor with syntax highlighting
 Startup=FTestEditor
 Icon=.hidden/control/texteditor.png
-Version=3.13.90
+Version=3.14.90
 VersionFile=1
 Component=gb.image
 Component=gb.gui

comp/src/gb.form.editor/.src/TextEditor.class

@@ -903,7 +903,8 @@ Private Sub DrawLine(X As Integer, Y As Integer, Width As Integer, Height As Int
   If Row = $iStopLine Then
     Paint.FillRect(X, Y, Width, Height, $hStyles[Highlight.Current].Color)
   Else If $bShowCurrent And If Row = $Y Then
-    Paint.FillRect(X, Y + $XY.Y, Width, H, $hStyles[Highlight.CurrentLine].Color)
+    'Paint.FillRect(X, Y + $XY.Y, Width, H, $hStyles[Highlight.CurrentLine].Color)
+    Paint.FillRect(X, Y, Width, Height, $hStyles[Highlight.CurrentLine].Color)
   Endif
   
   hInfo = $hDoc.Info(Row)