Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
Ivenjs committed Jul 12, 2024
1 parent 763bcb2 commit f299017
Show file tree
Hide file tree
Showing 7 changed files with 114 additions and 39 deletions.
4 changes: 2 additions & 2 deletions src/SqueakWhiteboard-Core/WBResizeTopLeft.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ Class {

{
#category : #defaults,
#'squeak_changestamp' : 'is 7/12/2024 15:02'
#'squeak_changestamp' : 'is 7/12/2024 18:40'
}
WBResizeTopLeft class >> resizeCursor [

^ Cursor resizeTopRight
^ Cursor resizeTopLeft
]

{
Expand Down
5 changes: 3 additions & 2 deletions src/SqueakWhiteboard-Tests/WBElementLineTests.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ WBElementLineTests >> line: aLine [

{
#category : #setUp,
#'squeak_changestamp' : 'si 7/11/2024 18:20'
#'squeak_changestamp' : 'is 7/12/2024 18:44'
}
WBElementLineTests >> setUp [
| mouseEvent1 mouseEvent2 |

super setUp.
mouseEvent1 := MouseButtonEvent new.
mouseEvent1 setType: #mouseDown position: self canvas position + (100 @ 100) which: 4 buttons: mouseEvent1 class redButton hand: HandMorph new stamp: 0.
Expand All @@ -40,7 +41,7 @@ WBElementLineTests >> setUp [
line := ((WBLine newWithCanvas: self canvas) arrowHead: true).
self canvas spawnAnElement: (line) At: (MouseButtonEvent new position: self canvas position + (100 @ 100)).
line mouseUp: mouseEvent1.
line mouseUp: mouseEvent2.
line mouseUp: mouseEvent2
]

{
Expand Down
4 changes: 2 additions & 2 deletions src/SqueakWhiteboard-Tests/WBElementResizeTests.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ WBElementResizeTests >> element: anElement [

{
#category : #setUp,
#'squeak_changestamp' : 'si 7/11/2024 20:41'
#'squeak_changestamp' : 'is 7/12/2024 18:44'
}
WBElementResizeTests >> setUp [

super setUp.
self element: (WBRectangularElement newWithCanvas: self canvas).
self element position: 100 @ 100.
self element extent: 100 @ 100.
self element extent: 100 @ 100
]

{
Expand Down
4 changes: 2 additions & 2 deletions src/SqueakWhiteboard-Tests/WBMoveElementTests.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ WBMoveElementTests >> element: anElement [

{
#category : #setUp,
#'squeak_changestamp' : 'si 7/12/2024 09:37'
#'squeak_changestamp' : 'is 7/12/2024 18:44'
}
WBMoveElementTests >> setUp [

super setUp.
self canvas spawnAnElement: (WBRectangularElement newWithCanvas: self canvas) At: self artificialMouseClick.
self canvas dropElement: self artificialMouseClick.
self element: (self canvas elements at: 1).
self element: (self canvas elements at: 1)
]

{
Expand Down
62 changes: 49 additions & 13 deletions src/SqueakWhiteboard-Tests/WBResizeBarTests.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,12 @@ WBResizeBarTests >> testMouseOver [

{
#category : #testing,
#'squeak_changestamp' : 'is 7/12/2024 15:16'
#'squeak_changestamp' : 'is 7/12/2024 18:25'
}
WBResizeBarTests >> testResizeCursor [
| aResizeBarTop aResizeBarBottom aResizeBarRight aResizeBarLeft aMouseEvent prevCursor |
WBResizeBarTests >> testResizeCursorBottom [
| aResizeBarBottom aMouseEvent prevCursor |

aResizeBarTop := WBResizeTop new.
aResizeBarBottom := WBResizeBottom new.
aResizeBarRight := WBResizeRight new.
aResizeBarLeft := WBResizeLeft new.
aMouseEvent := MouseButtonEvent new.
aMouseEvent setType: #mouseDown position: (0 @ 0) which: 4 buttons: aMouseEvent class redButton hand: HandMorph new stamp: 0.
prevCursor := Cursor currentCursor.
Expand All @@ -93,23 +90,62 @@ WBResizeBarTests >> testResizeCursor [
self assert: Cursor currentCursor = aResizeBarBottom class resizeCursor.

aResizeBarBottom mouseLeave: aMouseEvent.
self assert: Cursor currentCursor = prevCursor.

aResizeBarTop mouseEnter: aMouseEvent.
self assert: Cursor currentCursor = aResizeBarTop class resizeCursor.
self assert: Cursor currentCursor = prevCursor
]

{
#category : #testing,
#'squeak_changestamp' : 'is 7/12/2024 18:26'
}
WBResizeBarTests >> testResizeCursorLeft [
| aResizeBarLeft aMouseEvent prevCursor |

aResizeBarTop mouseLeave: aMouseEvent.
self assert: Cursor currentCursor = prevCursor.
aResizeBarLeft := WBResizeLeft new.
aMouseEvent := MouseButtonEvent new.
aMouseEvent setType: #mouseDown position: (0 @ 0) which: 4 buttons: aMouseEvent class redButton hand: HandMorph new stamp: 0.
prevCursor := Cursor currentCursor.

aResizeBarLeft mouseEnter: aMouseEvent.
self assert: Cursor currentCursor = aResizeBarLeft class resizeCursor.

aResizeBarLeft mouseLeave: aMouseEvent.
self assert: Cursor currentCursor = prevCursor.
self assert: Cursor currentCursor = prevCursor
]

{
#category : #testing,
#'squeak_changestamp' : 'is 7/12/2024 18:26'
}
WBResizeBarTests >> testResizeCursorRight [
| aResizeBarRight aMouseEvent prevCursor |

aResizeBarRight := WBResizeRight new.
aMouseEvent := MouseButtonEvent new.
aMouseEvent setType: #mouseDown position: (0 @ 0) which: 4 buttons: aMouseEvent class redButton hand: HandMorph new stamp: 0.
prevCursor := Cursor currentCursor.

aResizeBarRight mouseEnter: aMouseEvent.
self assert: Cursor currentCursor = aResizeBarRight class resizeCursor.

aResizeBarRight mouseLeave: aMouseEvent.
self assert: Cursor currentCursor = prevCursor
]

{
#category : #testing,
#'squeak_changestamp' : 'is 7/12/2024 18:27'
}
WBResizeBarTests >> testResizeCursorTop [
| aResizeBarTop aMouseEvent prevCursor |

aResizeBarTop := WBResizeTop new.
aMouseEvent := MouseButtonEvent new.
aMouseEvent setType: #mouseDown position: (0 @ 0) which: 4 buttons: aMouseEvent class redButton hand: HandMorph new stamp: 0.
prevCursor := Cursor currentCursor.

aResizeBarTop mouseEnter: aMouseEvent.
self assert: Cursor currentCursor = aResizeBarTop class resizeCursor.

aResizeBarTop mouseLeave: aMouseEvent.
self assert: Cursor currentCursor = prevCursor
]
62 changes: 50 additions & 12 deletions src/SqueakWhiteboard-Tests/WBResizeHandleTests.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,12 @@ WBResizeHandleTests >> testMouseOver [

{
#category : #testing,
#'squeak_changestamp' : 'is 7/12/2024 15:15'
#'squeak_changestamp' : 'is 7/12/2024 18:22'
}
WBResizeHandleTests >> testResizeCursor [
| aResizeHandleBottomLeft aResizeHandleBottomRight aResizeHandleTopLeft aResizeHandleTopRight aMouseEvent prevCursor |
WBResizeHandleTests >> testResizeCursorBottomLeft [
| aResizeHandleBottomLeft aMouseEvent prevCursor |

aResizeHandleBottomLeft := WBResizeBottomLeft new.
aResizeHandleBottomRight := WBResizeBottomRight new.
aResizeHandleTopLeft := WBResizeTopLeft new.
aResizeHandleTopRight := WBResizeTopRight new.
aMouseEvent := MouseButtonEvent new.
aMouseEvent setType: #mouseDown position: (0 @ 0) which: 4 buttons: aMouseEvent class redButton hand: HandMorph new stamp: 0.
prevCursor := Cursor currentCursor.
Expand All @@ -95,23 +92,64 @@ WBResizeHandleTests >> testResizeCursor [
self assert: Cursor currentCursor = aResizeHandleBottomLeft class resizeCursor.

aResizeHandleBottomLeft mouseLeave: aMouseEvent.
self assert: Cursor currentCursor = prevCursor.
self assert: Cursor currentCursor = prevCursor
]

{
#category : #testing,
#'squeak_changestamp' : 'is 7/12/2024 18:23'
}
WBResizeHandleTests >> testResizeCursorBottomRight [
| aResizeHandleBottomRight aMouseEvent prevCursor |

aResizeHandleBottomRight := WBResizeBottomRight new.
aMouseEvent := MouseButtonEvent new.
aMouseEvent setType: #mouseDown position: (0 @ 0) which: 4 buttons: aMouseEvent class redButton hand: HandMorph new stamp: 0.
prevCursor := Cursor currentCursor.

aResizeHandleBottomRight mouseEnter: aMouseEvent.
self assert: Cursor currentCursor = aResizeHandleBottomRight class resizeCursor.

aResizeHandleBottomLeft mouseLeave: aMouseEvent.
self assert: Cursor currentCursor = prevCursor.
aResizeHandleBottomRight mouseLeave: aMouseEvent.
self assert: Cursor currentCursor = prevCursor
]

{
#category : #testing,
#'squeak_changestamp' : 'is 7/12/2024 18:24'
}
WBResizeHandleTests >> testResizeCursorTopLeft [
| aResizeHandleTopLeft aMouseEvent prevCursor |

aResizeHandleTopLeft := WBResizeTopLeft new.
aMouseEvent := MouseButtonEvent new.
aMouseEvent setType: #mouseDown position: (0 @ 0) which: 4 buttons: aMouseEvent class redButton hand: HandMorph new stamp: 0.
prevCursor := Cursor currentCursor.

aResizeHandleTopLeft mouseEnter: aMouseEvent.
self assert: Cursor currentCursor = aResizeHandleTopLeft class resizeCursor.

aResizeHandleBottomLeft mouseLeave: aMouseEvent.
self assert: Cursor currentCursor = prevCursor.
aResizeHandleTopLeft mouseLeave: aMouseEvent.
self assert: Cursor currentCursor = prevCursor


]

{
#category : #testing,
#'squeak_changestamp' : 'is 7/12/2024 18:24'
}
WBResizeHandleTests >> testResizeCursorTopRight [
| aResizeHandleTopRight aMouseEvent prevCursor |

aResizeHandleTopRight := WBResizeTopRight new.
aMouseEvent := MouseButtonEvent new.
aMouseEvent setType: #mouseDown position: (0 @ 0) which: 4 buttons: aMouseEvent class redButton hand: HandMorph new stamp: 0.
prevCursor := Cursor currentCursor.

aResizeHandleTopRight mouseEnter: aMouseEvent.
self assert: Cursor currentCursor = aResizeHandleTopRight class resizeCursor.

aResizeHandleBottomLeft mouseLeave: aMouseEvent.
aResizeHandleTopRight mouseLeave: aMouseEvent.
self assert: Cursor currentCursor = prevCursor
]
12 changes: 6 additions & 6 deletions src/SqueakWhiteboard-Tests/WBTextfieldTests.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -151,20 +151,20 @@ WBTextfieldTests >> testTextfieldActivation [

{
#category : #testing,
#'squeak_changestamp' : 'si 7/11/2024 14:15'
#'squeak_changestamp' : 'is 7/12/2024 18:30'
}
WBTextfieldTests >> testTextfieldCursor [
| anElement aFirstMouseEvent prevCursor |
| anElement aMouseEvent prevCursor |

anElement := WBRectangularElement newWithCanvas: self canvas.
aFirstMouseEvent := MouseButtonEvent new.
aFirstMouseEvent setType: #mouseDown position: anElement position which: 4 buttons: aFirstMouseEvent class redButton hand: HandMorph new stamp: 0.
aMouseEvent := MouseButtonEvent new.
aMouseEvent setType: #mouseDown position: anElement position which: 4 buttons: aMouseEvent class redButton hand: HandMorph new stamp: 0.

prevCursor := Cursor currentCursor.
anElement textField textMorph mouseEnter: aFirstMouseEvent.
anElement textField textMorph mouseEnter: aMouseEvent.
self assert: Cursor currentCursor = Cursor text.

anElement textField textMorph mouseLeave: aFirstMouseEvent.
anElement textField textMorph mouseLeave: aMouseEvent.
self assert: Cursor currentCursor = prevCursor
]

Expand Down

0 comments on commit f299017

Please sign in to comment.