From 791373ca94293a70f569cea94cd7262956fceac7 Mon Sep 17 00:00:00 2001 From: Guille Polito Date: Tue, 14 Jan 2025 09:59:14 +0100 Subject: [PATCH] Revert "Presenters in Pharo remember their last size and does not use initial extent anymore if its not first time opened" --- ...eGitHubAcceptPullRequestPresenter.class.st | 11 ++++---- ...eGitHubCreatePullRequestPresenter.class.st | 13 +++++----- .../IceGitHubNewBranchFromIssuePanel.class.st | 13 +++++----- ...eGitHubRejectPullRequestPresenter.class.st | 11 ++++---- .../IceGitHubRemoveBranchesPresenter.class.st | 15 +++++------ .../IceGitHubTipPullRequestBrowser.class.st | 11 ++++---- ...ceTipGitHubPullRequestListBrowser.class.st | 11 ++++---- ...TipFiletreeToTonelDialogPresenter.class.st | 14 +++++----- ...pAddPlaintextCredentialsPresenter.class.st | 12 +++++---- .../IceTipAddRemoteDialogPresenter.class.st | 16 +++++++----- .../IceTipAddSSHCredentialsPresenter.class.st | 12 +++++---- ...ceTipAddTokenCredentialsPresenter.class.st | 11 ++++---- ...kForPlaintextCredentialsPresenter.class.st | 11 ++++---- ...rPlaintextOtpCredentialsPresenter.class.st | 11 ++++---- Iceberg-TipUI/IceTipBrowser.class.st | 11 ++++---- .../IceTipCheckoutBranchDialog.class.st | 11 ++++---- .../IceTipCherrypickPreviewBrowser.class.st | 11 ++++---- Iceberg-TipUI/IceTipCommitBrowser.class.st | 11 ++++---- ...ipDiscardAllChangesPreviewBrowser.class.st | 11 ++++---- ...EditPlaintextCredentialsPresenter.class.st | 11 ++++---- .../IceTipEditProjectDialogPresenter.class.st | 26 +++++++++++-------- ...IceTipEditSSHCredentialsPresenter.class.st | 11 ++++---- .../IceTipErrorDialogPresenter.class.st | 19 +++++++------- ...itUsernameAndEmailDialogPresenter.class.st | 11 ++++---- .../IceTipHistoryActionBrowser.class.st | 11 ++++---- Iceberg-TipUI/IceTipHistoryBrowser.class.st | 11 ++++---- .../IceTipLocalRepositoryPanel.class.st | 19 +++++++------- .../IceTipMergeBranchDialogPresenter.class.st | 11 ++++---- .../IceTipOptionDialogPresenter.class.st | 11 ++++---- Iceberg-TipUI/IceTipPresenter.class.st | 13 ++++++++-- Iceberg-TipUI/IceTipPreviewBrowser.class.st | 11 ++++---- ...ceTipRemovePackageDialogPresenter.class.st | 15 ++++++----- ...ipRemoveRepositoryDialogPresenter.class.st | 19 +++++++------- ...ipRepairRepositoryDialogPresenter.class.st | 11 ++++---- .../IceTipRepositoriesBrowser.class.st | 11 ++++---- .../IceTipRepositoryBrowser.class.st | 11 ++++---- .../IceTipVersionHistoryBrowser.class.st | 11 ++++---- .../IceTipWorkingCopyBrowser.class.st | 11 ++++---- 38 files changed, 266 insertions(+), 215 deletions(-) diff --git a/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestPresenter.class.st b/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestPresenter.class.st index 1b7b7d69b5..b15f76f86b 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestPresenter.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestPresenter.class.st @@ -16,11 +16,6 @@ Class { #tag : 'View' } -{ #category : 'accessing' } -IceGitHubAcceptPullRequestModel class >> defaultPreferredExtent [ - ^ (600 @ 300) -] - { #category : 'class initialization' } IceGitHubAcceptPullRequestPresenter class >> initialize [ @@ -67,6 +62,12 @@ IceGitHubAcceptPullRequestPresenter >> defaultType [ ^ 'merge' ] +{ #category : 'api' } +IceGitHubAcceptPullRequestPresenter >> initialExtentForWindow [ + + ^ (600 @ 300) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceGitHubAcceptPullRequestPresenter >> initializeDialogWindow: aDialogWindowPresenter [ diff --git a/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestPresenter.class.st b/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestPresenter.class.st index 6363ab9ad7..976dc04aed 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestPresenter.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestPresenter.class.st @@ -31,11 +31,6 @@ Class { #tag : 'View' } -{ #category : 'accessing' } -IceGitHubCreatePullRequestModel class >> defaultPreferredExtent [ - ^ (700 @ 300) -] - { #category : 'class initialization' } IceGitHubCreatePullRequestPresenter class >> initialize [ @@ -256,7 +251,13 @@ IceGitHubCreatePullRequestPresenter >> headRemote [ ] { #category : 'initialization' } -IceGitHubCreatePullRequestModel >> initializeDialogWindow: aWindow [ +IceGitHubCreatePullRequestPresenter >> initialExtentForWindow [ + + ^ (700 @ 300) scaledByDisplayScaleFactor +] + +{ #category : 'initialization' } +IceGitHubCreatePullRequestPresenter >> initializeDialogWindow: aWindow [ aWindow addButton: 'Cancel' do: [ :presenter | diff --git a/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st b/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st index e9c8b4d4ce..f4c042fefd 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st @@ -23,13 +23,6 @@ Class { #tag : 'View' } -{ #category : 'accessing' } -IceGitHubNewBranchFromIssuePanel class >> defaultPreferredExtent [ - - - ^ 800 @ 175 -] - { #category : 'accessing' } IceGitHubNewBranchFromIssuePanel >> branchName [ @@ -63,6 +56,12 @@ IceGitHubNewBranchFromIssuePanel >> icon [ ^ (self iconNamed: #github) scaledToSize: 16@16 ] +{ #category : 'initialization' } +IceGitHubNewBranchFromIssuePanel >> initialExtentForWindow [ + + ^ 800 @ 175 +] + { #category : 'initialization' } IceGitHubNewBranchFromIssuePanel >> initialize [ diff --git a/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestPresenter.class.st b/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestPresenter.class.st index 8e86d16da8..3b19ec2798 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestPresenter.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestPresenter.class.st @@ -15,11 +15,6 @@ Class { #tag : 'View' } -{ #category : 'accessing' } -IceGitHubRejectPullRequestModel class >> defaultPreferredExtent [ - ^ (500 @ 250) -] - { #category : 'class initialization' } IceGitHubRejectPullRequestPresenter class >> initialize [ @@ -63,6 +58,12 @@ IceGitHubRejectPullRequestPresenter >> defaultType [ ^ 'merge' ] +{ #category : 'api' } +IceGitHubRejectPullRequestPresenter >> initialExtentForWindow [ + + ^ (500 @ 250) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceGitHubRejectPullRequestPresenter >> initializeDialogWindow: aDialogWindowPresenter [ diff --git a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesPresenter.class.st b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesPresenter.class.st index 9ec6c8f310..440841baf3 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesPresenter.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesPresenter.class.st @@ -16,13 +16,6 @@ Class { #tag : 'View' } -{ #category : 'accessing' } -IceGitHubRemoveBranchesModel class >> defaultPreferredExtent [ - - - ^ 550 @ 500 -] - { #category : 'class initialization' } IceGitHubRemoveBranchesPresenter class >> initialize [ @@ -52,7 +45,13 @@ IceGitHubRemoveBranchesPresenter >> displayBlock: aBlock [ ] { #category : 'initialization' } -IceGitHubRemoveBranchesModel >> initialize [ +IceGitHubRemoveBranchesPresenter >> initialExtentForWindow [ + + ^ 550 @ 500 +] + +{ #category : 'initialization' } +IceGitHubRemoveBranchesPresenter >> initialize [ selectedItems := Set new. super initialize diff --git a/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st b/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st index 3f5496fbd4..9a0eb4bc29 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st @@ -37,11 +37,6 @@ IceGitHubTipPullRequestBrowser class >> buildSelectionCommandGroupWith: presente "Nothing to add" ] -{ #category : 'accessing' } -IceGitHubTipPullRequestBrowser class >> defaultPreferredExtent [ - ^ (1050 @ 800) -] - { #category : 'instance creation' } IceGitHubTipPullRequestBrowser class >> newApplication: app model: aModel pullRequest: aPullRequest [ @@ -126,6 +121,12 @@ IceGitHubTipPullRequestBrowser >> diff [ ^ diff ] +{ #category : 'initialization' } +IceGitHubTipPullRequestBrowser >> initialExtentForWindow [ + + ^ (1050 @ 800) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceGitHubTipPullRequestBrowser >> initializeCommitsTable [ diff --git a/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st b/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st index bc6e350423..ccd135bc0b 100644 --- a/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st +++ b/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st @@ -43,11 +43,6 @@ IceTipGitHubPullRequestListBrowser class >> buildSelectionCommandGroupWith: pres ] -{ #category : 'accessing' } -IceTipGitHubPullRequestListBrowser class >> defaultPreferredExtent [ - ^ (700 @ 700) -] - { #category : 'instance creation' } IceTipGitHubPullRequestListBrowser class >> onRepository: aRepository [ @@ -100,6 +95,12 @@ IceTipGitHubPullRequestListBrowser >> fetchPullRequests [ yourself ] ] +{ #category : 'initialization' } +IceTipGitHubPullRequestListBrowser >> initialExtentForWindow [ + + ^ (700 @ 700) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipGitHubPullRequestListBrowser >> initializePresenters [ diff --git a/Iceberg-Plugin-Migration/IceTipFiletreeToTonelDialogPresenter.class.st b/Iceberg-Plugin-Migration/IceTipFiletreeToTonelDialogPresenter.class.st index 38a0aff50f..0d7fcfaa54 100644 --- a/Iceberg-Plugin-Migration/IceTipFiletreeToTonelDialogPresenter.class.st +++ b/Iceberg-Plugin-Migration/IceTipFiletreeToTonelDialogPresenter.class.st @@ -17,12 +17,6 @@ Class { #tag : 'UI' } -{ #category : 'accessing' } -IceTipFiletreeToTonelDialogPresenter class >> defaultPreferredExtent [ - - ^ 500 @ (self inputTextHeight * 5 + self buttonHeight + 50) -] - { #category : 'actions' } IceTipFiletreeToTonelDialogPresenter >> accept [ @@ -94,6 +88,14 @@ IceTipFiletreeToTonelDialogPresenter >> iconPanel [ ^ iconPanel ] +{ #category : 'initialization' } +IceTipFiletreeToTonelDialogPresenter >> initialExtentForWindow [ + + ^ (500 + @ (self class inputTextHeight * 5 + self class buttonHeight + 50)) + scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipFiletreeToTonelDialogPresenter >> initializePresenters [ diff --git a/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st index 7b7b9f970f..9d957b8259 100644 --- a/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st @@ -13,11 +13,6 @@ Class { #tag : 'Credentials' } -{ #category : 'accessing' } -IceTipAddPlaintextCredentialsPresenter class >> defaultPreferredExtent [ - ^ (350 @ (self inputTextHeight * 5 + self buttonHeight)) -] - { #category : 'testing' } IceTipAddPlaintextCredentialsPresenter >> accept [ @@ -43,6 +38,13 @@ IceTipAddPlaintextCredentialsPresenter >> hostnameFromInput [ ^ hostInput text ] +{ #category : 'initialization' } +IceTipAddPlaintextCredentialsPresenter >> initialExtentForWindow [ + + ^ (350 @ (self class inputTextHeight * 5 + self class buttonHeight)) + scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipAddPlaintextCredentialsPresenter >> initializePresenters [ diff --git a/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st b/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st index 54b5b8c803..acbc999013 100644 --- a/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st @@ -17,12 +17,6 @@ Class { #tag : 'View-Repository' } -{ #category : 'accessing' } -IceTipAddRemoteDialogPresenter class >> defaultPreferredExtent [ - - ^ 500 @ (self inputTextHeight * 2 + self buttonHeight + 50) "Yes, a magic number" -] - { #category : 'actions' } IceTipAddRemoteDialogPresenter >> accept [ @@ -49,6 +43,16 @@ IceTipAddRemoteDialogPresenter >> defaultLayout [ ] +{ #category : 'initialization' } +IceTipAddRemoteDialogPresenter >> initialExtentForWindow [ + + ^ (500@( + self class inputTextHeight * 2 + + self class buttonHeight + + 50 "Yes, a magic number" + )) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipAddRemoteDialogPresenter >> initializePresenters [ diff --git a/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st index 9b0e20ade9..0d5ea539bb 100644 --- a/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st @@ -13,11 +13,6 @@ Class { #tag : 'Credentials' } -{ #category : 'accessing' } -IceTipAddSSHCredentialsPresenter class >> defaultPreferredExtent [ - ^ (350 @ (self inputTextHeight * 7 + self buttonHeight)) -] - { #category : 'actions' } IceTipAddSSHCredentialsPresenter >> accept [ @@ -44,6 +39,13 @@ IceTipAddSSHCredentialsPresenter >> hostnameFromInput [ ^ hostInput text ] +{ #category : 'initialization' } +IceTipAddSSHCredentialsPresenter >> initialExtentForWindow [ + + ^ (350 @ (self class inputTextHeight * 7 + self class buttonHeight)) + scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipAddSSHCredentialsPresenter >> initializePresenters [ diff --git a/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st index 34eadcafef..c4931d633d 100644 --- a/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st @@ -17,11 +17,6 @@ Class { #tag : 'Credentials' } -{ #category : 'accessing' } -IceTipAddTokenCredentialsPresenter class >> defaultPreferredExtent [ - ^ (350 @ (self inputTextHeight * 5 + self buttonHeight)) -] - { #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> accept [ @@ -49,6 +44,12 @@ IceTipAddTokenCredentialsPresenter >> hostnameFromInput [ ^ hostInput text ] +{ #category : 'initialization' } +IceTipAddTokenCredentialsPresenter >> initialExtentForWindow [ + + ^ (350 @ (self class inputTextHeight * 5 + self class buttonHeight)) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipAddTokenCredentialsPresenter >> initializePresenters [ diff --git a/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st index 385e26b492..07247e0c33 100644 --- a/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st @@ -10,11 +10,6 @@ Class { #tag : 'Credentials' } -{ #category : 'accessing' } -IceTipAskForPlaintextCredentialsPresenter class >> defaultPreferredExtent [ - ^ (450 @ 180) -] - { #category : 'actions' } IceTipAskForPlaintextCredentialsPresenter >> accept [ @@ -51,6 +46,12 @@ IceTipAskForPlaintextCredentialsPresenter >> defaultLayout [ ] +{ #category : 'initialization' } +IceTipAskForPlaintextCredentialsPresenter >> initialExtentForWindow [ + + ^ (450 @ 180) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipAskForPlaintextCredentialsPresenter >> titleForWindow [ diff --git a/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st index 106521be73..b288110683 100644 --- a/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st @@ -10,11 +10,6 @@ Class { #tag : 'Credentials' } -{ #category : 'accessing' } -IceTipAskForPlaintextOtpCredentialsPresenter class >> defaultPreferredExtent [ - ^ (350 @ 210) -] - { #category : 'layout' } IceTipAskForPlaintextOtpCredentialsPresenter >> defaultLayout [ @@ -33,6 +28,12 @@ IceTipAskForPlaintextOtpCredentialsPresenter >> defaultLayout [ yourself ] +{ #category : 'initialization' } +IceTipAskForPlaintextOtpCredentialsPresenter >> initialExtentForWindow [ + + ^ (350 @ 210) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipAskForPlaintextOtpCredentialsPresenter >> initializePresenters [ diff --git a/Iceberg-TipUI/IceTipBrowser.class.st b/Iceberg-TipUI/IceTipBrowser.class.st index e2a7a0523c..362c60245e 100644 --- a/Iceberg-TipUI/IceTipBrowser.class.st +++ b/Iceberg-TipUI/IceTipBrowser.class.st @@ -63,11 +63,6 @@ IceTipBrowser class >> buildSelectionExtraCommandGroupWith: presenter for: aComm aCommandGroup register: (IceFiletreeToTonelCommand forSpecContext: presenter) ] -{ #category : 'accessing' } -IceTipBrowser class >> defaultPreferredExtent [ - ^ (600 @ 400) -] - { #category : 'commands' } IceTipBrowser class >> generalCommandGroupName [ @@ -125,6 +120,12 @@ IceTipBrowser >> iconForWindow [ ^ self iconNamed: #komitterSmalltalkhubRemote ] +{ #category : 'initialization' } +IceTipBrowser >> initialExtentForWindow [ + + ^ (600 @ 400) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipBrowser >> initialize [ diff --git a/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st b/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st index b733a47a83..d85a08a506 100644 --- a/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st +++ b/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st @@ -15,11 +15,6 @@ Class { #tag : 'View-Branch' } -{ #category : 'accessing' } -IceTipCheckoutBranchDialog class >> defaultPreferredExtent [ - ^ (600 @ 400) -] - { #category : 'instance creation' } IceTipCheckoutBranchDialog class >> onRepository: aRepository [ @@ -62,6 +57,12 @@ IceTipCheckoutBranchDialog >> doAccept [ self selectedType doAccept ] +{ #category : 'initialization' } +IceTipCheckoutBranchDialog >> initialExtentForWindow [ + + ^ (600 @ 400) scaledByDisplayScaleFactor +] + { #category : 'accessing' } IceTipCheckoutBranchDialog >> model [ diff --git a/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st b/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st index 556d42b3ce..5c598cfec6 100644 --- a/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st @@ -22,11 +22,6 @@ IceTipCherrypickPreviewBrowser class >> buildSelectionCommandGroupWith: presente "Nothing to add" ] -{ #category : 'accessing' } -IceTipCherrypickPreviewBrowser class >> defaultPreferredExtent [ - ^ (800 @ 600) -] - { #category : 'instance creation' } IceTipCherrypickPreviewBrowser class >> onCommitish: aCommitish [ ^ self @@ -65,6 +60,12 @@ IceTipCherrypickPreviewBrowser >> doCherryPick [ self closeWindow ] +{ #category : 'initialization' } +IceTipCherrypickPreviewBrowser >> initialExtentForWindow [ + + ^ (800 @ 600) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipCherrypickPreviewBrowser >> initializePresenters [ diff --git a/Iceberg-TipUI/IceTipCommitBrowser.class.st b/Iceberg-TipUI/IceTipCommitBrowser.class.st index 80ab10a6c1..834c6c1b32 100644 --- a/Iceberg-TipUI/IceTipCommitBrowser.class.st +++ b/Iceberg-TipUI/IceTipCommitBrowser.class.st @@ -39,11 +39,6 @@ IceTipCommitBrowser class >> buildSelectionCommandGroupWith: presenter for: aCom ] -{ #category : 'accessing' } -IceTipCommitBrowser class >> defaultPreferredExtent [ - ^ (800@600) -] - { #category : 'instance creation' } IceTipCommitBrowser class >> onRepository: aRepository [ @@ -146,6 +141,12 @@ IceTipCommitBrowser >> doExpandSelection [ diffPanel doExpandSelection ] +{ #category : 'initialization' } +IceTipCommitBrowser >> initialExtentForWindow [ + + ^ (800@600) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipCommitBrowser >> initialize [ diff --git a/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st b/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st index 755196474e..e3adc08fca 100644 --- a/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st @@ -6,11 +6,6 @@ Class { #tag : 'View-Branch' } -{ #category : 'accessing' } -IceTipDiscardAllChangesPreviewBrowser class >> defaultPreferredExtent [ - ^ (900 @ 400) -] - { #category : 'instance creation' } IceTipDiscardAllChangesPreviewBrowser class >> onRepository: anIceModelRepository [ @@ -28,6 +23,12 @@ IceTipDiscardAllChangesPreviewBrowser >> doDiscardAll [ executeWithContext: self ] +{ #category : 'initialization' } +IceTipDiscardAllChangesPreviewBrowser >> initialExtentForWindow [ + + ^ (900 @ 400) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipDiscardAllChangesPreviewBrowser >> initializePresenters [ diff --git a/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st index 0d67bcf9b7..962f411b2d 100644 --- a/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st @@ -9,11 +9,6 @@ Class { #tag : 'Credentials' } -{ #category : 'accessing' } -IceTipEditPlaintextCredentialsPresenter class >> defaultPreferredExtent [ - ^ (350 @ 160) -] - { #category : 'actions' } IceTipEditPlaintextCredentialsPresenter >> accept [ @@ -32,6 +27,12 @@ IceTipEditPlaintextCredentialsPresenter >> defaultLayout [ yourself ] +{ #category : 'initialization' } +IceTipEditPlaintextCredentialsPresenter >> initialExtentForWindow [ + + ^ (350 @ 160) scaledByDisplayScaleFactor +] + { #category : 'actions' } IceTipEditPlaintextCredentialsPresenter >> refreshCredentialsFromPresenter [ diff --git a/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st b/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st index 195f35c6b8..8af8283653 100644 --- a/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st @@ -23,17 +23,6 @@ Class { #tag : 'View-Repository' } -{ #category : 'accessing' } -IceTipEditProjectDialogPresenter class >> defaultPreferredExtent [ - - ^ self new hasToShowWarning - ifTrue: [ (475 @ 525) scaledByDisplayScaleFactor ] - ifFalse: [ - (475 - @ (200 + (self inputTextHeight * 3) + self buttonHeight + 75)) - scaledByDisplayScaleFactor "Tree" "Yes, a magic number" ] -] - { #category : 'actions' } IceTipEditProjectDialogPresenter >> accept [ @@ -213,6 +202,21 @@ IceTipEditProjectDialogPresenter >> hasToShowWarning [ ^ model repository workingCopy packages isNotEmpty ] +{ #category : 'initialization' } +IceTipEditProjectDialogPresenter >> initialExtentForWindow [ + + ^ self hasToShowWarning + ifTrue: [ (475@525) scaledByDisplayScaleFactor ] + ifFalse: [ + (475@( + 200 "Tree" + + (self class inputTextHeight * 3) + + self class buttonHeight + + 75 "Yes, a magic number" + )) scaledByDisplayScaleFactor] + +] + { #category : 'initialization' } IceTipEditProjectDialogPresenter >> initialize [ diff --git a/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st index 1b576e2127..6ba89b4467 100644 --- a/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st @@ -9,11 +9,6 @@ Class { #tag : 'Credentials' } -{ #category : 'accessing' } -IceTipEditSSHCredentialsPresenter class >> defaultPreferredExtent [ - ^ (500@230) -] - { #category : 'actions' } IceTipEditSSHCredentialsPresenter >> accept [ @@ -34,6 +29,12 @@ IceTipEditSSHCredentialsPresenter >> defaultLayout [ yourself ] +{ #category : 'initialization' } +IceTipEditSSHCredentialsPresenter >> initialExtentForWindow [ + + ^ (500@230) scaledByDisplayScaleFactor +] + { #category : 'actions' } IceTipEditSSHCredentialsPresenter >> refreshCredentialsFromPresenter [ diff --git a/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st b/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st index f4bc6a0cab..7576a4ca0a 100644 --- a/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st @@ -19,15 +19,6 @@ Class { #tag : 'View' } -{ #category : 'accessing' } -IceTipErrorDialogPresenter class >> defaultPreferredExtent [ - ^ (500@( - self inputTextHeight * 2 - + self buttonHeight - + 50 "Yes, a magic number" - )) -] - { #category : 'initialization' } IceTipErrorDialogPresenter >> accept [ @@ -70,6 +61,16 @@ IceTipErrorDialogPresenter >> iconPanel [ ^ iconPanel ] +{ #category : 'initialization' } +IceTipErrorDialogPresenter >> initialExtentForWindow [ + + ^ (500@( + self class inputTextHeight * 2 + + self class buttonHeight + + 50 "Yes, a magic number" + )) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipErrorDialogPresenter >> initializeDialogWindow: aWindow [ diff --git a/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st b/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st index 4213a3e9d7..17a42bdec6 100644 --- a/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st @@ -18,11 +18,6 @@ Class { #tag : 'View' } -{ #category : 'accessing' } -IceTipGitUsernameAndEmailDialogPresenter class >> defaultPreferredExtent [ - ^ (400@200) -] - { #category : 'actions' } IceTipGitUsernameAndEmailDialogPresenter >> accept [ @@ -80,6 +75,12 @@ IceTipGitUsernameAndEmailDialogPresenter >> globalCheckbox [ ^ globalCheckbox ] +{ #category : 'initialization' } +IceTipGitUsernameAndEmailDialogPresenter >> initialExtentForWindow [ + + ^ (400@200) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipGitUsernameAndEmailDialogPresenter >> initializePresenters [ diff --git a/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st b/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st index c58162546c..63008dd9c3 100644 --- a/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st +++ b/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st @@ -14,11 +14,6 @@ Class { #tag : 'View-Repository' } -{ #category : 'accessing' } -IceTipHistoryActionBrowser class >> defaultPreferredExtent [ - ^ (800@600) -] - { #category : 'actions' } IceTipHistoryActionBrowser >> accept [ @@ -43,6 +38,12 @@ IceTipHistoryActionBrowser >> commitsPanel: aSpPresenter [ commitsPanel := aSpPresenter ] +{ #category : 'initialization' } +IceTipHistoryActionBrowser >> initialExtentForWindow [ + + ^ (800@600) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipHistoryActionBrowser >> initializePresenters [ diff --git a/Iceberg-TipUI/IceTipHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHistoryBrowser.class.st index 49d431bf9f..6b7d3e8a91 100644 --- a/Iceberg-TipUI/IceTipHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHistoryBrowser.class.st @@ -37,11 +37,6 @@ IceTipHistoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCo ] -{ #category : 'accessing' } -IceTipHistoryBrowser class >> defaultPreferredExtent [ - ^ (700 @ 700) -] - { #category : 'specs' } IceTipHistoryBrowser class >> panelSpec [ @@ -78,6 +73,12 @@ IceTipHistoryBrowser >> defaultLayout [ yourself ] +{ #category : 'initialization' } +IceTipHistoryBrowser >> initialExtentForWindow [ + + ^ (700 @ 700) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipHistoryBrowser >> initializeCommitList [ diff --git a/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st b/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st index 426da0da97..8353de625c 100644 --- a/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st @@ -10,15 +10,6 @@ Class { #tag : 'View-Repository' } -{ #category : 'accessing' } -IceTipLocalRepositoryPanel class >> defaultPreferredExtent [ - ^ (500@( - self inputTextHeight * 2 - + self buttonHeight - + 50 "Yes, a magic number" - )) -] - { #category : 'accessing' } IceTipLocalRepositoryPanel class >> order [ @@ -42,6 +33,16 @@ IceTipLocalRepositoryPanel >> iconForWindow [ ^ self iconNamed: #smallOpen ] +{ #category : 'initialization' } +IceTipLocalRepositoryPanel >> initialExtentForWindow [ + + ^ (500@( + self class inputTextHeight * 2 + + self class buttonHeight + + 50 "Yes, a magic number" + )) scaledByDisplayScaleFactor +] + { #category : 'testing' } IceTipLocalRepositoryPanel >> isLocalRepository [ diff --git a/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st b/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st index 6f8149c75b..06cb558eff 100644 --- a/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st @@ -15,11 +15,6 @@ Class { #tag : 'View-Branch' } -{ #category : 'accessing' } -IceTipMergeBranchDialogPresenter class >> defaultPreferredExtent [ - ^ (600 @ 400) -] - { #category : 'instance creation' } IceTipMergeBranchDialogPresenter class >> onRepository: aRepository [ @@ -65,6 +60,12 @@ IceTipMergeBranchDialogPresenter >> doAccept [ self selectedType doAccept ] +{ #category : 'initialization' } +IceTipMergeBranchDialogPresenter >> initialExtentForWindow [ + + ^ (600 @ 400) scaledByDisplayScaleFactor +] + { #category : 'accessing' } IceTipMergeBranchDialogPresenter >> model [ diff --git a/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st b/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st index 981d7d4367..f48ffc4fc0 100644 --- a/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st @@ -19,11 +19,6 @@ Class { #tag : 'View' } -{ #category : 'accessing' } -IceTipOptionDialogPresenter class >> defaultPreferredExtent [ - ^ (700 @ 300) -] - { #category : 'actions' } IceTipOptionDialogPresenter >> accept [ @@ -69,6 +64,12 @@ IceTipOptionDialogPresenter >> doAccept [ self subclassResponsibility ] +{ #category : 'initialization' } +IceTipOptionDialogPresenter >> initialExtentForWindow [ + + ^ (700 @ 300) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipOptionDialogPresenter >> initializeDialogWindow: aWindowPresenter [ diff --git a/Iceberg-TipUI/IceTipPresenter.class.st b/Iceberg-TipUI/IceTipPresenter.class.st index 3dc38c8cba..e6fa418d83 100644 --- a/Iceberg-TipUI/IceTipPresenter.class.st +++ b/Iceberg-TipUI/IceTipPresenter.class.st @@ -51,6 +51,15 @@ IceTipPresenter >> iconForWindow [ ^ self iconNamed: #smallWindow ] +{ #category : 'initialization' } +IceTipPresenter >> initialExtentForWindow [ + "Answer either nil or a Point representing the initial extent of this presenter. + It is used during initialization if this presenter is opened inside a SpWindowPresenter. + Answer nil if there is not a suggested extent." + + ^ nil +] + { #category : 'initialization' } IceTipPresenter >> initializeWindow: aSpWindowPresenter [ @@ -58,8 +67,8 @@ IceTipPresenter >> initializeWindow: aSpWindowPresenter [ self setTitleTo: aSpWindowPresenter. self setWindowIconTo: aSpWindowPresenter. - "self setInitialExtentTo: aSpWindowPresenter." - + self setInitialExtentTo: aSpWindowPresenter + ] diff --git a/Iceberg-TipUI/IceTipPreviewBrowser.class.st b/Iceberg-TipUI/IceTipPreviewBrowser.class.st index 408921c2a1..50cb8b30d1 100644 --- a/Iceberg-TipUI/IceTipPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipPreviewBrowser.class.st @@ -27,11 +27,6 @@ IceTipPreviewBrowser class >> buildSelectionCommandGroupWith: presenter for: aCo "Nothing to add" ] -{ #category : 'accessing' } -IceTipPreviewBrowser class >> defaultPreferredExtent [ - ^ (800 @ 400) -] - { #category : 'accessing - ui' } IceTipPreviewBrowser >> actionPanel [ @@ -55,6 +50,12 @@ IceTipPreviewBrowser >> diffPanel [ ^ diffPanel ] +{ #category : 'initialization' } +IceTipPreviewBrowser >> initialExtentForWindow [ + + ^ (800 @ 400) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipPreviewBrowser >> initializePresenters [ diff --git a/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st b/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st index edf73c6a81..b6ffefe89f 100644 --- a/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st @@ -13,13 +13,6 @@ Class { #tag : 'View-WorkingCopy' } -{ #category : 'accessing' } -IceTipRemovePackageDialogPresenter class >> defaultPreferredExtent [ - - ^ (500 @ (self inputTextHeight * 2 + self buttonHeight + 75)) - scaledByDisplayScaleFactor "Yes, a magic number" -] - { #category : 'actions' } IceTipRemovePackageDialogPresenter >> accept [ @@ -63,6 +56,14 @@ IceTipRemovePackageDialogPresenter >> iconPanel [ ^ iconPanel ] +{ #category : 'initialization' } +IceTipRemovePackageDialogPresenter >> initialExtentForWindow [ + + ^ (500 + @ (self class inputTextHeight * 2 + self class buttonHeight + 75)) + scaledByDisplayScaleFactor "Yes, a magic number" +] + { #category : 'initialization' } IceTipRemovePackageDialogPresenter >> initializePresenters [ diff --git a/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st b/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st index 43b016227a..71fe70061b 100644 --- a/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st @@ -12,15 +12,6 @@ Class { #tag : 'View-Repository' } -{ #category : 'accessing' } -IceTipRemoveRepositoryDialogPresenter class >> defaultPreferredExtent [ - ^ (500@( - self inputTextHeight * 2 - + self buttonHeight - + 50 "Yes, a magic number" - )) -] - { #category : 'actions' } IceTipRemoveRepositoryDialogPresenter >> accept [ @@ -61,6 +52,16 @@ IceTipRemoveRepositoryDialogPresenter >> iconPanel [ ^ iconPanel ] +{ #category : 'initialization' } +IceTipRemoveRepositoryDialogPresenter >> initialExtentForWindow [ + + ^ (500@( + self class inputTextHeight * 2 + + self class buttonHeight + + 50 "Yes, a magic number" + )) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipRemoveRepositoryDialogPresenter >> initializePresenters [ diff --git a/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st b/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st index f49f0a39e5..5ef6ca781f 100644 --- a/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st @@ -13,11 +13,6 @@ Class { #tag : 'View-Repository' } -{ #category : 'accessing' } -IceTipRepairRepositoryDialogPresenter class >> defaultPreferredExtent [ - ^ (700 @ 500) -] - { #category : 'instance creation' } IceTipRepairRepositoryDialogPresenter class >> onRepository: aRepository [ @@ -57,6 +52,12 @@ IceTipRepairRepositoryDialogPresenter >> detailPanel [ ^ detailPanel ] +{ #category : 'initialization' } +IceTipRepairRepositoryDialogPresenter >> initialExtentForWindow [ + + ^ (700 @ 500) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> initializeDialogWindow: aWindow [ diff --git a/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st b/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st index 0d2894fea4..c374b924a6 100644 --- a/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st +++ b/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st @@ -62,11 +62,6 @@ IceTipRepositoriesBrowser class >> buildSelectionExtraCommandGroupWith: presente ] -{ #category : 'accessing' } -IceTipRepositoriesBrowser class >> defaultPreferredExtent [ - ^ (600 @ 500) -] - { #category : 'accessing' } IceTipRepositoriesBrowser class >> iconForWorldMenu [ @@ -165,6 +160,12 @@ IceTipRepositoriesBrowser >> iconForWindow [ ^ self class iconForWorldMenu ] +{ #category : 'initialization' } +IceTipRepositoriesBrowser >> initialExtentForWindow [ + + ^ (600 @ 500) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipRepositoriesBrowser >> initializePresenters [ diff --git a/Iceberg-TipUI/IceTipRepositoryBrowser.class.st b/Iceberg-TipUI/IceTipRepositoryBrowser.class.st index 34c2ff7b20..9facefa407 100644 --- a/Iceberg-TipUI/IceTipRepositoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipRepositoryBrowser.class.st @@ -52,11 +52,6 @@ IceTipRepositoryBrowser class >> buildSelectionCommandGroupWith: presenter for: ] -{ #category : 'accessing' } -IceTipRepositoryBrowser class >> defaultPreferredExtent [ - ^ (1000 @ 700) -] - { #category : 'instance creation' } IceTipRepositoryBrowser class >> new [ self error: 'Use #onRepository:' @@ -105,6 +100,12 @@ IceTipRepositoryBrowser >> historyPanel [ ^ historyPanel ] +{ #category : 'initialization' } +IceTipRepositoryBrowser >> initialExtentForWindow [ + + ^ (1000 @ 700) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipRepositoryBrowser >> initializePresenters [ diff --git a/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st b/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st index 313f922814..be5ec68ff2 100644 --- a/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st @@ -37,11 +37,6 @@ IceTipVersionHistoryBrowser class >> buildSelectionCommandGroupWith: presenter f ] -{ #category : 'accessing' } -IceTipVersionHistoryBrowser class >> defaultPreferredExtent [ - ^ (700@700) -] - { #category : 'instance creation' } IceTipVersionHistoryBrowser class >> onRepository: aRepository method: aMethod [ @@ -65,6 +60,12 @@ IceTipVersionHistoryBrowser >> defaultLayout [ yourself ] +{ #category : 'initialization' } +IceTipVersionHistoryBrowser >> initialExtentForWindow [ + + ^ (700@700) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipVersionHistoryBrowser >> initializeCommitList [ diff --git a/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st b/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st index 6402467ac2..35c64f0435 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st @@ -49,11 +49,6 @@ IceTipWorkingCopyBrowser class >> buildSelectionCommandGroupWith: presenter for: ] -{ #category : 'accessing' } -IceTipWorkingCopyBrowser class >> defaultPreferredExtent [ - ^ (700 @ 500) -] - { #category : 'instance creation' } IceTipWorkingCopyBrowser class >> onRepository: aRepository [ @@ -121,6 +116,12 @@ IceTipWorkingCopyBrowser >> iconFor: aPackage [ ^ self iconNamed: #package ] +{ #category : 'initialization' } +IceTipWorkingCopyBrowser >> initialExtentForWindow [ + + ^ (700 @ 500) scaledByDisplayScaleFactor +] + { #category : 'initialization' } IceTipWorkingCopyBrowser >> initializePackagesTable [