From cce8f0cb54cfd29c55a064f8b6f7feaa2b5d49c8 Mon Sep 17 00:00:00 2001 From: AlexisCnockaert Date: Fri, 31 Jan 2025 10:45:03 +0100 Subject: [PATCH 1/3] changed menu bug display and updated baseline --- src/BaselineOfNewTools/BaselineOfNewTools.class.st | 2 ++ .../SpClosedWindowListPresenter.class.st | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/BaselineOfNewTools/BaselineOfNewTools.class.st b/src/BaselineOfNewTools/BaselineOfNewTools.class.st index e07b05d6..ac58f67c 100644 --- a/src/BaselineOfNewTools/BaselineOfNewTools.class.st +++ b/src/BaselineOfNewTools/BaselineOfNewTools.class.st @@ -120,6 +120,7 @@ BaselineOfNewTools >> baseline: spec [ group: 'Core' with: #( 'NewTools-Core' 'NewTools-Core-Tests' 'NewTools-Morphic' ); group: 'Playground' with: #( 'Core' 'NewTools-Playground' 'NewTools-Playground-Tests' ); group: 'Inspector' with: #( 'Core' 'NewTools-Inspector' 'NewTools-Inspector-Tests' ); + group: 'ClosedWindows' with: #( 'Core' 'NewTools-WindowManager'); group: 'Debugger' with: #( 'Core' 'Inspector' @@ -195,6 +196,7 @@ BaselineOfNewTools >> baseline: spec [ group: 'default' with: #( 'Playground' 'Inspector' + 'ClosedWindows' 'CritiqueBrowser' 'Debugger' 'SystemReporter' diff --git a/src/NewTools-WindowManager/SpClosedWindowListPresenter.class.st b/src/NewTools-WindowManager/SpClosedWindowListPresenter.class.st index a7ac211f..e8f7bcdd 100644 --- a/src/NewTools-WindowManager/SpClosedWindowListPresenter.class.st +++ b/src/NewTools-WindowManager/SpClosedWindowListPresenter.class.st @@ -78,11 +78,12 @@ SpClosedWindowListPresenter class >> windowMenuOn: aBuilder [ SpClosedWindowListPresenter class >> windowsOn: aBuilder [ - (aBuilder group: #Windows) with: [ + (aBuilder item: #'Unclose window') - order: 90; + parent: #Windows; + order: 1; action: [ self new open ]; - help: 'Show last 5 closed Windows' ] + help: 'Show last 5 closed Windows' ] { #category : 'adding' } From 94c4829e80584553accc2412754a2668464a10d2 Mon Sep 17 00:00:00 2001 From: AlexisCnockaert Date: Fri, 31 Jan 2025 14:27:18 +0100 Subject: [PATCH 2/3] fix --- src/BaselineOfNewTools/BaselineOfNewTools.class.st | 3 ++- .../SpClosedWindowListPresenter.class.st | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/BaselineOfNewTools/BaselineOfNewTools.class.st b/src/BaselineOfNewTools/BaselineOfNewTools.class.st index ac58f67c..be4d48a9 100644 --- a/src/BaselineOfNewTools/BaselineOfNewTools.class.st +++ b/src/BaselineOfNewTools/BaselineOfNewTools.class.st @@ -263,7 +263,8 @@ BaselineOfNewTools >> packageRepositoryURLForSpec: spec [ BaselineOfNewTools >> postload: loader package: packageSpec [ MCMethodDefinition initializersEnabled: initializersEnabled. - self loadThemeImages + self loadThemeImages. + SystemWindow useHideForClose: true ] { #category : 'actions' } diff --git a/src/NewTools-WindowManager/SpClosedWindowListPresenter.class.st b/src/NewTools-WindowManager/SpClosedWindowListPresenter.class.st index e8f7bcdd..318ed755 100644 --- a/src/NewTools-WindowManager/SpClosedWindowListPresenter.class.st +++ b/src/NewTools-WindowManager/SpClosedWindowListPresenter.class.st @@ -34,8 +34,7 @@ Class { 'unhideButton', 'removeButton', 'unhideItemBlock', - 'removeItemBlock', - 'title' + 'removeItemBlock' ], #classInstVars : [ 'lastClosedWindows' @@ -88,9 +87,10 @@ SpClosedWindowListPresenter class >> windowsOn: aBuilder [ { #category : 'adding' } SpClosedWindowListPresenter >> addClosedWindow: aModel [ - + self lastClosedWindows size >= 5 ifTrue: [ - self lastClosedWindows removeLast close ]. + 5 to: self lastClosedWindows size do: [ :i | + self lastClosedWindows removeLast close ] ]. aModel labelString = 'Last Closed Windows' ifFalse: [ self lastClosedWindows addFirst: aModel ]. self refresh From 0d3eb8687f94273f3c94c586c0e7c96d810bda2d Mon Sep 17 00:00:00 2001 From: AlexisCnockaert Date: Fri, 31 Jan 2025 16:24:48 +0100 Subject: [PATCH 3/3] remove itself when closed --- .../SpClosedWindowListPresenter.class.st | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/NewTools-WindowManager/SpClosedWindowListPresenter.class.st b/src/NewTools-WindowManager/SpClosedWindowListPresenter.class.st index 318ed755..a71fbcf6 100644 --- a/src/NewTools-WindowManager/SpClosedWindowListPresenter.class.st +++ b/src/NewTools-WindowManager/SpClosedWindowListPresenter.class.st @@ -91,8 +91,9 @@ SpClosedWindowListPresenter >> addClosedWindow: aModel [ self lastClosedWindows size >= 5 ifTrue: [ 5 to: self lastClosedWindows size do: [ :i | self lastClosedWindows removeLast close ] ]. - aModel labelString = 'Last Closed Windows' ifFalse: [ - self lastClosedWindows addFirst: aModel ]. + aModel labelString = 'Last Closed Windows' + ifFalse: [ self lastClosedWindows addFirst: aModel ] + ifTrue: [ aModel closeBoxHit ]. self refresh ]