Skip to content

Commit 87c7e67

Browse files
josesimoesjosesimoes
authored
Update Graphics assembly (#2450)
***NO_CI***
1 parent ba6b4d4 commit 87c7e67

File tree

2 files changed

+36
-33
lines changed

2 files changed

+36
-33
lines changed

‎src/nanoFramework.Graphics/Graphics/Native/nanoFramework_Graphics.h‎

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@
1212

1313
#include "Graphics.h"
1414

15+
typedef enum __nfpack TouchInputFlags
16+
{
17+
TouchInputFlags_None = 0,
18+
TouchInputFlags_Primary = 16,
19+
TouchInputFlags_Pen = 64,
20+
TouchInputFlags_Palm = 128,
21+
} TouchInputFlags;
22+
1523
struct Library_nanoFramework_Graphics_nanoFramework_UI_RoutedEvent
1624
{
1725
static const int FIELD_STATIC___eventCount = 0;
@@ -746,13 +754,6 @@ struct Library_nanoFramework_Graphics_nanoFramework_UI_TouchInput
746754
static const int FIELD__ContactHeight = 6;
747755

748756
//--//
749-
//_The following was not generated___________
750-
//___________________________________________
751-
static const CLR_UINT32 FLAG__None = 0x00;
752-
static const CLR_UINT32 FLAG__Primary = 0x10;
753-
static const CLR_UINT32 FLAG__Pen = 0x40;
754-
static const CLR_UINT32 FLAG__Palm = 0x80;
755-
//___________________________________________
756757
};
757758

758759
struct Library_nanoFramework_Graphics_nanoFramework_UI_Input_TouchDevice
@@ -765,8 +766,8 @@ struct Library_nanoFramework_Graphics_nanoFramework_UI_Input_TouchDevice
765766

766767
struct Library_nanoFramework_Graphics_nanoFramework_Runtime_Events_GenericEventEx
767768
{
768-
static const int FIELD__X = 1;
769-
static const int FIELD__Y = 2;
769+
static const int FIELD__X = 6;
770+
static const int FIELD__Y = 7;
770771

771772
//--//
772773
};
@@ -849,7 +850,9 @@ struct Library_nanoFramework_Graphics_nanoFramework_UI_I2cConfiguration
849850

850851
struct Library_nanoFramework_Graphics_nanoFramework_UI_DisplayControl
851852
{
852-
static const int FIELD_STATIC___fullScreen = 20;
853+
static const int FIELD_STATIC___maximumBufferSize = 20;
854+
static const int FIELD_STATIC___fullScreen = 21;
855+
static const int FIELD_STATIC___point = 22;
853856

854857
NANOCLR_NATIVE_DECLARE(get_LongerSide___STATIC__I4);
855858
NANOCLR_NATIVE_DECLARE(get_ShorterSide___STATIC__I4);
@@ -903,19 +906,19 @@ struct Library_nanoFramework_Graphics_nanoFramework_UI_Input_ButtonDevice
903906

904907
struct Library_nanoFramework_Graphics_nanoFramework_UI_Input_Buttons
905908
{
906-
static const int FIELD_STATIC__PreviewButtonDownEvent = 21;
907-
static const int FIELD_STATIC__PreviewButtonUpEvent = 22;
908-
static const int FIELD_STATIC__ButtonDownEvent = 23;
909-
static const int FIELD_STATIC__ButtonUpEvent = 24;
910-
static const int FIELD_STATIC__GotFocusEvent = 25;
911-
static const int FIELD_STATIC__LostFocusEvent = 26;
909+
static const int FIELD_STATIC__PreviewButtonDownEvent = 23;
910+
static const int FIELD_STATIC__PreviewButtonUpEvent = 24;
911+
static const int FIELD_STATIC__ButtonDownEvent = 25;
912+
static const int FIELD_STATIC__ButtonUpEvent = 26;
913+
static const int FIELD_STATIC__GotFocusEvent = 27;
914+
static const int FIELD_STATIC__LostFocusEvent = 28;
912915

913916
//--//
914917
};
915918

916919
struct Library_nanoFramework_Graphics_nanoFramework_UI_Input_GenericEvents
917920
{
918-
static const int FIELD_STATIC__GenericStandardEvent = 27;
921+
static const int FIELD_STATIC__GenericStandardEvent = 29;
919922

920923
//--//
921924
};
@@ -964,16 +967,16 @@ struct Library_nanoFramework_Graphics_nanoFramework_UI_Input_RawTouchInputReport
964967

965968
struct Library_nanoFramework_Graphics_nanoFramework_UI_Input_TouchCapture
966969
{
967-
static const int FIELD_STATIC___captureElement = 28;
970+
static const int FIELD_STATIC___captureElement = 30;
968971

969972
//--//
970973
};
971974

972975
struct Library_nanoFramework_Graphics_nanoFramework_UI_Input_TouchEvents
973976
{
974-
static const int FIELD_STATIC__TouchDownEvent = 29;
975-
static const int FIELD_STATIC__TouchMoveEvent = 30;
976-
static const int FIELD_STATIC__TouchUpEvent = 31;
977+
static const int FIELD_STATIC__TouchDownEvent = 31;
978+
static const int FIELD_STATIC__TouchMoveEvent = 32;
979+
static const int FIELD_STATIC__TouchUpEvent = 33;
977980

978981
//--//
979982
};
@@ -1018,8 +1021,8 @@ struct Library_nanoFramework_Graphics_nanoFramework_UI_Threading_DispatcherTimer
10181021

10191022
struct Library_nanoFramework_Graphics_nanoFramework_UI_Touch
10201023
{
1021-
static const int FIELD_STATIC___initialized = 32;
1022-
static const int FIELD_STATIC___activeTouchPanel = 33;
1024+
static const int FIELD_STATIC___initialized = 34;
1025+
static const int FIELD_STATIC___activeTouchPanel = 35;
10231026

10241027
//--//
10251028
};
@@ -1034,10 +1037,10 @@ struct Library_nanoFramework_Graphics_nanoFramework_UI_TouchCollector
10341037

10351038
struct Library_nanoFramework_Graphics_nanoFramework_UI_TouchCollectorConfiguration
10361039
{
1037-
static const int FIELD_STATIC___collectionMode = 34;
1038-
static const int FIELD_STATIC___collectionMethod = 35;
1039-
static const int FIELD_STATIC___touchCollector = 36;
1040-
static const int FIELD_STATIC___collectionBufferSize = 37;
1040+
static const int FIELD_STATIC___collectionMode = 36;
1041+
static const int FIELD_STATIC___collectionMethod = 37;
1042+
static const int FIELD_STATIC___touchCollector = 38;
1043+
static const int FIELD_STATIC___collectionBufferSize = 39;
10411044

10421045
NANOCLR_NATIVE_DECLARE(GetTouchPoints___STATIC__VOID__BYREF_I4__SZARRAY_I2__SZARRAY_I2);
10431046
NANOCLR_NATIVE_DECLARE(
@@ -1050,8 +1053,8 @@ struct Library_nanoFramework_Graphics_nanoFramework_UI_TouchCollectorConfigurati
10501053

10511054
struct Library_nanoFramework_Graphics_nanoFramework_UI_TouchEvent
10521055
{
1053-
static const int FIELD__Time = 1;
1054-
static const int FIELD__Touches = 2;
1056+
static const int FIELD__Time = 3;
1057+
static const int FIELD__Touches = 4;
10551058

10561059
//--//
10571060
};

‎src/nanoFramework.Graphics/Graphics/Native/nanoFramework_Graphics_nanoFramework_UI_TouchEventProcessor.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,19 +75,19 @@ HRESULT Library_nanoFramework_Graphics_nanoFramework_UI_TouchEventProcessor::
7575
(CLR_UINT8)(location >> 28));
7676

7777
CLR_UINT32 contact = touchPoint->contact;
78-
CLR_UINT32 flags = Library_nanoFramework_Graphics_nanoFramework_UI_TouchInput::FLAG__None;
78+
CLR_UINT32 flags = TouchInputFlags_None;
7979

8080
if ((contact & TouchPointContactFlags_Primary) != 0)
8181
{
82-
flags |= Library_nanoFramework_Graphics_nanoFramework_UI_TouchInput::FLAG__Primary;
82+
flags |= TouchInputFlags_Primary;
8383
}
8484
if ((contact & TouchPointContactFlags_Pen) != 0)
8585
{
86-
flags |= Library_nanoFramework_Graphics_nanoFramework_UI_TouchInput::FLAG__Pen;
86+
flags |= TouchInputFlags_Pen;
8787
}
8888
if ((contact & TouchPointContactFlags_Palm) != 0)
8989
{
90-
flags |= Library_nanoFramework_Graphics_nanoFramework_UI_TouchInput::FLAG__Palm;
90+
flags |= TouchInputFlags_Palm;
9191
}
9292

9393
touchInput[Library_nanoFramework_Graphics_nanoFramework_UI_TouchInput::FIELD__Flags].SetInteger(

0 commit comments

Comments
 (0)