File tree 2 files changed +9
-7
lines changed
2 files changed +9
-7
lines changed Original file line number Diff line number Diff line change @@ -2894,8 +2894,8 @@ public virtual bool OnMouseEvent (MouseEvent mouseEvent)
2894
2894
return false ;
2895
2895
}
2896
2896
2897
- if ( mouseEvent . Flags . HasFlag ( MouseFlags . Button1Clicked ) || mouseEvent . Flags . HasFlag ( MouseFlags . Button2Clicked )
2898
- || mouseEvent . Flags . HasFlag ( MouseFlags . Button3Clicked ) || mouseEvent . Flags . HasFlag ( MouseFlags . Button4Clicked ) ) {
2897
+ if ( ( mouseEvent . Flags & MouseFlags . Button1Clicked ) != 0 || ( mouseEvent . Flags & MouseFlags . Button2Clicked ) != 0
2898
+ || ( mouseEvent . Flags & MouseFlags . Button3Clicked ) != 0 || ( mouseEvent . Flags & MouseFlags . Button4Clicked ) != 0 ) {
2899
2899
2900
2900
var args = new MouseEventArgs ( mouseEvent ) ;
2901
2901
if ( OnMouseClick ( args ) ) {
Original file line number Diff line number Diff line change @@ -4582,16 +4582,18 @@ public void View_Instance_Use_Attribute_Normal_On_Draw ()
4582
4582
000000" , new Attribute [ ] { Colors . TopLevel . Normal , Colors . TopLevel . Focus } ) ;
4583
4583
}
4584
4584
4585
- [ Fact ]
4586
- public void OnMouseClick_Is_Only_Raised_Once ( )
4585
+ [ Theory ]
4586
+ [ InlineData ( MouseFlags . Button1Pressed , MouseFlags . Button1Released , MouseFlags . Button1Clicked ) ]
4587
+ [ InlineData ( MouseFlags . Button1Pressed | MouseFlags . ButtonCtrl , MouseFlags . Button1Released | MouseFlags . ButtonCtrl , MouseFlags . Button1Clicked | MouseFlags . ButtonCtrl ) ]
4588
+ public void OnMouseClick_Is_Only_Raised_Once ( MouseFlags pressed , MouseFlags released , MouseFlags clicked )
4587
4589
{
4588
4590
var mouseClicks = 0 ;
4589
4591
var view = new View ( ) ;
4590
4592
view . MouseClick += ( _ ) => mouseClicks ++ ;
4591
4593
4592
- view . OnMouseEvent ( new MouseEvent ( ) { Flags = MouseFlags . Button1Pressed } ) ;
4593
- view . OnMouseEvent ( new MouseEvent ( ) { Flags = MouseFlags . Button1Released } ) ;
4594
- view . OnMouseEvent ( new MouseEvent ( ) { Flags = MouseFlags . Button1Clicked } ) ;
4594
+ view . OnMouseEvent ( new MouseEvent ( ) { Flags = pressed } ) ;
4595
+ view . OnMouseEvent ( new MouseEvent ( ) { Flags = released } ) ;
4596
+ view . OnMouseEvent ( new MouseEvent ( ) { Flags = clicked } ) ;
4595
4597
4596
4598
Assert . Equal ( 1 , mouseClicks ) ;
4597
4599
}
You can’t perform that action at this time.
0 commit comments