Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates and fix focus issues #29

Merged
merged 24 commits into from
Jun 18, 2024
Merged

Updates and fix focus issues #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
6e97969
Update Eto and migrate to .NET 5 for test apps
cwensley Jan 21, 2021
b6f1865
Gtk: Initialize Veldrid during Realized event
cwensley Jan 21, 2021
efaae07
Fix CI build
cwensley Jan 21, 2021
34a0c32
Gtk: Attempt to fix redraw issues on linux with NVidia cards
cwensley Feb 20, 2021
9d787a9
Mac: Only create GLArea when actually using OpenGL
cwensley May 30, 2021
e47c51c
Updating framework, applying TechPizzaDev's GTK/Veldrid changes.
philstopford Feb 11, 2024
842c758
Shuffling some things around.
philstopford Feb 12, 2024
e29a67b
This draws a partial line...
philstopford Feb 16, 2024
fe52d81
weird....
philstopford Feb 16, 2024
226fb82
Another step, but in which direction?
philstopford Feb 16, 2024
9c364d9
Update VeldridDriver.cs
philstopford Feb 16, 2024
143eacc
Update VeldridDriver.cs
philstopford Feb 16, 2024
f2f4ea2
Update VeldridDriver.cs
philstopford Feb 17, 2024
49dbbb4
Adding back demo functionality.
philstopford Feb 19, 2024
94d182c
More WIP
philstopford Feb 19, 2024
a64bd92
WIP
philstopford Feb 19, 2024
13d0da9
Fudging this focus/handler thing for now
philstopford Feb 19, 2024
522d49e
Splitting out the contents
philstopford Feb 19, 2024
1985257
More reorganization
philstopford Feb 19, 2024
62bdae1
Update MainForm.cs
philstopford Feb 19, 2024
b4f3bfc
Trying to find a workable keyboard handling approach
philstopford Feb 22, 2024
4e89995
For some reason, the Surface can't grab focus
philstopford Feb 26, 2024
0d48d90
Get focus and events working on Gtk
cwensley Apr 3, 2024
a88ba3d
Updates to clean things up
cwensley Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 25 additions & 24 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,31 @@ jobs:
PlatformBuildParameters: /p:Platform=Windows

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup .NET Core
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v4
with:
dotnet-version: 3.1.101
dotnet-version: '8.0.x'

- name: Setup msbuild
uses: microsoft/setup-msbuild@v1

- uses: actions/cache@v1
- uses: actions/cache@v4
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
restore-keys: |
${{ runner.os }}-nuget-

- name: Install macos workload
run: dotnet workload install macos

- name: Build
run: msbuild /restore ${{ env.PlatformBuildParameters }} ${{ env.BuildParameters }}
run: dotnet build ${{ env.PlatformBuildParameters }} ${{ env.BuildParameters }}

- name: Pack
run: msbuild /t:Pack ${{ env.PlatformBuildParameters }} ${{ env.BuildParameters }}
run: dotnet pack ${{ env.PlatformBuildParameters }} ${{ env.BuildParameters }}

- name: Upload artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: nuget
path: artifacts/nuget/**/*.nupkg
Expand All @@ -59,35 +59,36 @@ jobs:
PlatformBuildParameters: /p:Platform=Mac

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup .NET Core
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v4
with:
dotnet-version: 3.1.101
dotnet-version: '8.0.x'

- name: setup-xamarin
uses: maxim-lobanov/setup-xamarin@v1.1
- name: Setup XCode
uses: maxim-lobanov/setup-xcode@v1
with:
mono-version: latest
xamarin-mac-version: latest
xcode-version: latest
xcode-version: latest-stable

- uses: actions/cache@v1
- uses: actions/cache@v4
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
restore-keys: |
${{ runner.os }}-nuget-

- name: Install macos workload
run: dotnet workload install macos

- name: Build
run: msbuild /restore ${{ env.PlatformBuildParameters }} ${{ env.BuildParameters }}
run: dotnet build ${{ env.PlatformBuildParameters }} ${{ env.BuildParameters }}

- name: Pack
run: msbuild /t:Pack ${{ env.PlatformBuildParameters }} ${{ env.BuildParameters }}
run: dotnet pack ${{ env.PlatformBuildParameters }} ${{ env.BuildParameters }}

# - name: Upload artifacts
# uses: actions/upload-artifact@v2
# uses: actions/upload-artifact@v4
# with:
# name: nuget
# path: artifacts/nuget/**/Eto.Veldrid.XamMac2.nupkg
Expand All @@ -98,10 +99,10 @@ jobs:
if: github.event_name == 'release' && github.event.action == 'published'
steps:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v4

- name: Download NuGet Packages
uses: actions/download-artifact@v1
uses: actions/download-artifact@v4
with:
name: nuget

Expand Down
27 changes: 12 additions & 15 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,51 +11,48 @@
"preLaunchTask": "build",
"program": "",
"osx": {
"program": "${workspaceFolder}/artifacts/bin/TestEtoVeldrid.Mac64/Debug/netcoreapp3.1/osx-x64/TestEtoVeldrid.Mac64.app/Contents/MacOS/TestEtoVeldrid.Mac64"
"program": "${workspaceFolder}/artifacts/bin/TestEtoVeldrid.Mac64/Debug/net8.0/TestEtoVeldrid.Mac64.app/Contents/MacOS/TestEtoVeldrid.Mac64"
},
"linux": {
"program": "${workspaceFolder}/artifacts/bin/TestEtoVeldrid.Gtk/Debug/netcoreapp3.1/linux-x64/TestEtoVeldrid.Gtk.dll"
"program": "${workspaceFolder}/artifacts/bin/TestEtoVeldrid.Gtk/Debug/net8.0/linux-x64/TestEtoVeldrid.Gtk.dll"
},
"windows": {
"program": "${workspaceFolder}/artifacts/bin/TestEtoVeldrid.Wpf/Debug/netcoreapp3.1/win-x64/TestEtoVeldrid.Wpf.dll"
"program": "${workspaceFolder}/artifacts/bin/TestEtoVeldrid.Wpf/Debug/net8.0-windows/win-x64/TestEtoVeldrid.Wpf.dll"
},
"console": "internalConsole",
"stopAtEntry": false
},
{
"name": "Launch Mono",
"type": "mono",
"name": "Launch macOS",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "",
"osx": {
"program": "${workspaceFolder}/artifacts/bin/TestEtoVeldrid.Mac64/Debug/net472/osx-x64/TestEtoVeldrid.Mac64.app/Contents/MacOS/TestEtoVeldrid.Mac64",
"useRuntime": false
},
"linux": {
"program": "${workspaceFolder}/artifacts/bin/TestEtoVeldrid.Gtk/Debug/net472/linux-x64/TestEtoVeldrid.Gtk.exe"
"program": "${workspaceFolder}/artifacts/bin/TestEtoVeldrid.macOS/Debug/net8.0-macos/TestEtoVeldrid.macOS.app/Contents/MacOS/TestEtoVeldrid.macOS"
},
"console": "internalConsole"
"console": "internalConsole",
"stopAtEntry": false
},
{
"name": "Launch .NET (WPF)",
"name": "Launch WPF - net48",
"type": "clr",
"request": "launch",
"preLaunchTask": "build",
"program": "",
"windows": {
"program": "${workspaceFolder}/artifacts/bin/TestEtoVeldrid.Wpf/Debug/net472/win-x64/TestEtoVeldrid.Wpf.exe"
"program": "${workspaceFolder}/artifacts/bin/TestEtoVeldrid.Wpf/Debug/net48/win-x64/TestEtoVeldrid.Wpf.exe"
},
"console": "internalConsole"
},
{
"name": "Launch .NET (WinForms)",
"name": "Launch WinForms - net48",
"type": "clr",
"request": "launch",
"preLaunchTask": "build",
"program": "",
"windows": {
"program": "${workspaceFolder}/artifacts/bin/TestEtoVeldrid.WinForms/Debug/net472/win-x64/TestEtoVeldrid.WinForms.exe"
"program": "${workspaceFolder}/artifacts/bin/TestEtoVeldrid.WinForms/Debug/net48/win-x64/TestEtoVeldrid.WinForms.exe"
},
"console": "internalConsole"
},
Expand Down
86 changes: 24 additions & 62 deletions .vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,74 +4,36 @@
{
"label": "build",
"command": "dotnet",
"type": "process",
"osx": {
"args": [
"build",
"${workspaceFolder}/Eto.Veldrid.sln",
"/p:Platform=Mac",
"/p:Configuration=${input:configuration}",
"/p:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
},
"linux": {
"args": [
"build",
"${workspaceFolder}/Eto.Veldrid.sln",
"/p:Platform=Mac",
"/p:Configuration=${input:configuration}",
"/p:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
},
"windows": {
"args": [
"build",
"${workspaceFolder}/Eto.Veldrid.sln",
"/p:Platform=Windows",
"/p:Configuration=${input:configuration}",
"/p:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"type": "shell",
"args": [
"build",
"${workspaceFolder}/Eto.Veldrid.sln",
"/p:Configuration=${input:configuration}",
"/p:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile",
"presentation": {
"reveal": "always",
"clear": true
},
"problemMatcher": "$msCompile"
},
{
"label": "Pack",
"command": "dotnet",
"type": "process",
"osx": {
"args": [
"pack",
"${workspaceFolder}/Eto.Veldrid.sln",
"/p:Platform=Mac",
"/p:Configuration=${input:configuration}",
"/p:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
]
},
"linux": {
"args": [
"pack",
"${workspaceFolder}/Eto.Veldrid.sln",
"/p:Platform=Mac",
"/p:Configuration=${input:configuration}",
"/p:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
]
},
"windows": {
"args": [
"pack",
"${workspaceFolder}/Eto.Veldrid.sln",
"/p:Platform=Windows",
"/p:Configuration=${input:configuration}",
"/p:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
]
"args": [
"pack",
"${workspaceFolder}/Eto.Veldrid.sln",
"/p:Configuration=${input:configuration}",
"/p:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile",
"presentation": {
"reveal": "always",
"clear": true
},
"problemMatcher": "$msCompile"
}
],
"inputs": [
Expand All @@ -86,4 +48,4 @@
]
}
]
}
}
7 changes: 6 additions & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
</PropertyGroup>

<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>10.0</LangVersion>

<EnableWindowsTargeting>true</EnableWindowsTargeting>

<RestoreAdditionalProjectSources>https://www.myget.org/F/eto/</RestoreAdditionalProjectSources>

<TopLevelDirectory>$(MSBuildThisFileDirectory)</TopLevelDirectory>
Expand All @@ -28,7 +33,7 @@
</PropertyGroup>

<PropertyGroup>
<DevVersion>0.1.0</DevVersion>
<DevVersion>0.2.0</DevVersion>

<!-- set version from tag -->
<Version Condition="$(BuildBranch.StartsWith('refs/tags/'))">$(BuildBranch.Substring(10))</Version>
Expand Down
Loading