Compare commits

...

10 Commits

Author SHA1 Message Date
Admin 7e58513ab3 Remove unsupported artifact upload
CI / Build and Test (push) Successful in 16s Details
2025-12-27 13:05:55 -05:00
Admin a450daa86f Remove pwsh dependency
CI / Build and Test (push) Failing after 43s Details
2025-12-27 12:22:24 -05:00
Admin c8840f2e8b Use explicit .NET 9 path in workflows
CI / Build and Test (push) Failing after 9s Details
2025-12-27 12:06:47 -05:00
Admin f0dbd29b58 Rebuild with fixed PATH
CI / Build and Test (push) Failing after 10s Details
2025-12-27 12:01:33 -05:00
Admin a4f04f4966 Rebuild with .NET 9 PATH
CI / Build and Test (push) Failing after 9s Details
2025-12-27 11:54:40 -05:00
Admin a03c600864 Rebuild with Node.js
CI / Build and Test (push) Failing after 11s Details
2025-12-27 11:48:09 -05:00
Admin 0c460c1395 Trigger CI build
CI / Build and Test (push) Failing after 24s Details
2025-12-27 11:44:46 -05:00
Admin 0dd7a2d3fb Add Gitea Actions workflows for CI and NuGet release 2025-12-27 11:34:23 -05:00
Admin afbf8f6782 Fix layout rendering, text wrapping, and scrollbar issues
- LinuxViewRenderer: Remove redundant child rendering that caused "View already has a parent" errors
- SkiaLabel: Consider LineBreakMode.WordWrap for multi-line measurement and rendering
- SkiaScrollView: Update ContentSize in OnDraw with properly constrained measurement
- SkiaShell: Account for padding in MeasureOverride (consistent with ArrangeOverride)
- Version bump to 1.0.0-preview.4

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2025-12-27 11:20:27 -05:00
Admin 02b3da17d4 Update repository URLs to git.marketally.com
Migrated from GitHub to self-hosted Gitea server.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2025-12-27 09:45:26 -05:00
8 changed files with 125 additions and 111 deletions

37
.gitea/workflows/ci.yml Normal file
View File

@ -0,0 +1,37 @@
# OpenMaui Linux CI/CD Pipeline for Gitea
name: CI
on:
push:
branches: [main, develop]
pull_request:
branches: [main]
env:
DOTNET_NOLOGO: true
DOTNET_CLI_TELEMETRY_OPTOUT: true
DOTNET_ROOT: C:\dotnet
jobs:
build:
name: Build and Test
runs-on: windows
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Restore dependencies
run: C:\dotnet\dotnet.exe restore
- name: Build
run: C:\dotnet\dotnet.exe build --configuration Release --no-restore
- name: Run tests
run: C:\dotnet\dotnet.exe test --configuration Release --no-build --verbosity normal
continue-on-error: true
- name: Pack NuGet (preview)
run: C:\dotnet\dotnet.exe pack --configuration Release --no-build -o ./nupkg
- name: List NuGet packages
run: dir .\nupkg\

View File

@ -0,0 +1,46 @@
# OpenMaui Linux Release - Publish to NuGet
name: Release to NuGet
on:
release:
types: [published]
push:
tags:
- 'v*'
env:
DOTNET_NOLOGO: true
DOTNET_CLI_TELEMETRY_OPTOUT: true
DOTNET_ROOT: C:\dotnet
jobs:
release:
name: Build and Publish to NuGet
runs-on: windows
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Extract version from tag
id: version
shell: pwsh
run: |
$tag = "${{ github.ref_name }}"
$version = $tag -replace '^v', ''
echo "VERSION=$version" >> $env:GITHUB_OUTPUT
echo "Building version: $version"
- name: Restore dependencies
run: C:\dotnet\dotnet.exe restore
- name: Build
run: C:\dotnet\dotnet.exe build --configuration Release --no-restore
- name: Run tests
run: C:\dotnet\dotnet.exe test --configuration Release --no-build --verbosity normal
- name: Pack NuGet package
run: C:\dotnet\dotnet.exe pack --configuration Release --no-build -o ./nupkg /p:PackageVersion=${{ steps.version.outputs.VERSION }}
- name: Publish to NuGet.org
run: C:\dotnet\dotnet.exe nuget push ./nupkg/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate

View File

@ -442,6 +442,7 @@ public class LinuxViewRenderer
}
// Create handler for the view
// The handler's ConnectHandler and property mappers handle child views automatically
var handler = view.ToHandler(_mauiContext);
if (handler?.PlatformView is not SkiaView skiaView)
@ -450,98 +451,8 @@ public class LinuxViewRenderer
return CreateFallbackView(view);
}
// Recursively render children for layout views
if (view is ILayout layout && skiaView is SkiaLayoutView layoutView)
{
// For StackLayout, copy orientation and spacing
if (layoutView is SkiaStackLayout skiaStack)
{
if (view is Controls.VerticalStackLayout)
{
skiaStack.Orientation = StackOrientation.Vertical;
}
else if (view is Controls.HorizontalStackLayout)
{
skiaStack.Orientation = StackOrientation.Horizontal;
}
else if (view is Controls.StackLayout sl)
{
skiaStack.Orientation = sl.Orientation == Microsoft.Maui.Controls.StackOrientation.Vertical
? StackOrientation.Vertical : StackOrientation.Horizontal;
}
if (view is IStackLayout stackLayout)
{
skiaStack.Spacing = (float)stackLayout.Spacing;
}
}
// For Grid, set up row/column definitions
if (view is Controls.Grid mauiGrid && layoutView is SkiaGrid skiaGrid)
{
// Copy row definitions
foreach (var rowDef in mauiGrid.RowDefinitions)
{
skiaGrid.RowDefinitions.Add(new GridLength((float)rowDef.Height.Value,
rowDef.Height.IsAbsolute ? GridUnitType.Absolute :
rowDef.Height.IsStar ? GridUnitType.Star : GridUnitType.Auto));
}
// Copy column definitions
foreach (var colDef in mauiGrid.ColumnDefinitions)
{
skiaGrid.ColumnDefinitions.Add(new GridLength((float)colDef.Width.Value,
colDef.Width.IsAbsolute ? GridUnitType.Absolute :
colDef.Width.IsStar ? GridUnitType.Star : GridUnitType.Auto));
}
skiaGrid.RowSpacing = (float)mauiGrid.RowSpacing;
skiaGrid.ColumnSpacing = (float)mauiGrid.ColumnSpacing;
}
foreach (var child in layout)
{
if (child is IView childViewElement)
{
var childView = RenderView(childViewElement);
if (childView != null)
{
// For Grid, get attached properties for position
if (layoutView is SkiaGrid grid && child is BindableObject bindable)
{
var row = Controls.Grid.GetRow(bindable);
var col = Controls.Grid.GetColumn(bindable);
var rowSpan = Controls.Grid.GetRowSpan(bindable);
var colSpan = Controls.Grid.GetColumnSpan(bindable);
grid.AddChild(childView, row, col, rowSpan, colSpan);
}
else
{
layoutView.AddChild(childView);
}
}
}
}
}
else if (view is IContentView contentView && contentView.Content is IView contentElement)
{
var content = RenderView(contentElement);
if (content != null)
{
if (skiaView is SkiaBorder border)
{
border.AddChild(content);
}
else if (skiaView is SkiaFrame frame)
{
frame.AddChild(content);
}
else if (skiaView is SkiaScrollView scrollView)
{
scrollView.Content = content;
}
}
}
// Handlers manage their own children via ConnectHandler and property mappers
// No manual child rendering needed here - that caused "View already has a parent" errors
return skiaView;
}
catch (Exception)

View File

@ -12,18 +12,18 @@
<!-- NuGet Package Properties -->
<PackageId>OpenMaui.Controls.Linux</PackageId>
<Version>1.0.0-preview.1</Version>
<Version>1.0.0-preview.4</Version>
<Authors>MarketAlly LLC, David H. Friedel Jr.</Authors>
<Company>MarketAlly LLC</Company>
<Product>OpenMaui Linux Controls</Product>
<Description>Linux desktop support for .NET MAUI applications using SkiaSharp rendering. Supports X11 and Wayland display servers with 35+ controls, platform services, and accessibility support.</Description>
<Copyright>Copyright 2025 MarketAlly LLC</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/open-maui/maui-linux</PackageProjectUrl>
<RepositoryUrl>https://github.com/open-maui/maui-linux.git</RepositoryUrl>
<PackageProjectUrl>https://git.marketally.com/open-maui/maui-linux</PackageProjectUrl>
<RepositoryUrl>https://git.marketally.com/open-maui/maui-linux.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>maui;linux;desktop;skia;gui;cross-platform;dotnet;x11;wayland;openmaui</PackageTags>
<PackageReleaseNotes>Initial preview release with 35+ controls and full platform services.</PackageReleaseNotes>
<PackageReleaseNotes>Preview 4: Fixed handler rendering for layouts, text wrapping, and scrollbar measurement issues.</PackageReleaseNotes>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageIcon>icon.png</PackageIcon>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>

View File

@ -2,7 +2,6 @@
A comprehensive Linux platform implementation for .NET MAUI using SkiaSharp rendering.
[![Build Status](https://github.com/open-maui/maui-linux/actions/workflows/ci.yml/badge.svg)](https://github.com/open-maui/maui-linux/actions)
[![NuGet](https://img.shields.io/nuget/v/OpenMaui.Controls.Linux)](https://www.nuget.org/packages/OpenMaui.Controls.Linux)
[![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
@ -136,12 +135,12 @@ sudo dnf install libX11-devel libXrandr-devel libXcursor-devel libXi-devel mesa-
## Sample Applications
Full sample applications are available in the [maui-linux-samples](https://github.com/open-maui/maui-linux-samples) repository:
Full sample applications are available in the [maui-linux-samples](https://git.marketally.com/open-maui/maui-linux-samples) repository:
| Sample | Description |
|--------|-------------|
| **[TodoApp](https://github.com/open-maui/maui-linux-samples/tree/main/TodoApp)** | Task manager with NavigationPage, XAML data binding, CollectionView |
| **[ShellDemo](https://github.com/open-maui/maui-linux-samples/tree/main/ShellDemo)** | Control showcase with Shell navigation and flyout menu |
| **[TodoApp](https://git.marketally.com/open-maui/maui-linux-samples/src/branch/main/TodoApp)** | Task manager with NavigationPage, XAML data binding, CollectionView |
| **[ShellDemo](https://git.marketally.com/open-maui/maui-linux-samples/src/branch/main/ShellDemo)** | Control showcase with Shell navigation and flyout menu |
## Quick Example
@ -180,7 +179,7 @@ app.Run();
## Building from Source
```bash
git clone https://github.com/open-maui/maui-linux.git
git clone https://git.marketally.com/open-maui/maui-linux.git
cd maui-linux
dotnet build
dotnet test
@ -234,3 +233,7 @@ Copyright (c) 2025 MarketAlly LLC. Licensed under the MIT License - see the [LIC
- [SkiaSharp](https://github.com/mono/SkiaSharp) - 2D graphics library
- [.NET MAUI](https://github.com/dotnet/maui) - Cross-platform UI framework
- The .NET community

View File

@ -429,9 +429,10 @@ public class SkiaLabel : SkiaView
bounds.Bottom - Padding.Bottom);
// Handle single line vs multiline
// Use DrawSingleLine for normal labels (MaxLines <= 1 or unlimited) without newlines
// Use DrawMultiLineWithWrapping only when MaxLines > 1 (word wrap needed) or text has newlines
bool needsMultiLine = MaxLines > 1 || Text.Contains('\n');
// Use DrawMultiLineWithWrapping when: MaxLines > 1, text has newlines, OR WordWrap is enabled
bool needsMultiLine = MaxLines > 1 || Text.Contains('\n') ||
LineBreakMode == LineBreakMode.WordWrap ||
LineBreakMode == LineBreakMode.CharacterWrap;
if (needsMultiLine)
{
DrawMultiLineWithWrapping(canvas, paint, font, contentBounds);
@ -771,8 +772,10 @@ public class SkiaLabel : SkiaView
using var font = new SKFont(typeface, FontSize);
using var paint = new SKPaint(font);
// Use same logic as OnDraw: multiline only when MaxLines > 1 or text has newlines
bool needsMultiLine = MaxLines > 1 || Text.Contains('\n');
// Use multiline when: MaxLines > 1, text has newlines, OR WordWrap is enabled
bool needsMultiLine = MaxLines > 1 || Text.Contains('\n') ||
LineBreakMode == LineBreakMode.WordWrap ||
LineBreakMode == LineBreakMode.CharacterWrap;
if (!needsMultiLine)
{
var textBounds = new SKRect();

View File

@ -268,8 +268,16 @@ public class SkiaScrollView : SkiaView
if (_content != null)
{
// Ensure content is measured and arranged
var availableSize = new SKSize(bounds.Width, float.PositiveInfinity);
_content.Measure(availableSize);
// Account for vertical scrollbar width to prevent horizontal scrollbar from appearing
var effectiveWidth = bounds.Width;
if (Orientation != ScrollOrientation.Horizontal && VerticalScrollBarVisibility != ScrollBarVisibility.Never)
{
// Reserve space for vertical scrollbar if content might be taller than viewport
effectiveWidth -= ScrollBarWidth;
}
var availableSize = new SKSize(effectiveWidth, float.PositiveInfinity);
// Update ContentSize with the properly constrained measurement
ContentSize = _content.Measure(availableSize);
// Apply content's margin
var margin = _content.Margin;
@ -669,12 +677,18 @@ public class SkiaScrollView : SkiaView
case ScrollOrientation.Both:
// For Both: first measure with viewport width to get responsive layout
// Content can still exceed viewport if it has minimum width constraints
// Reserve space for vertical scrollbar to prevent horizontal scrollbar
contentWidth = float.IsInfinity(availableSize.Width) ? 800f : availableSize.Width;
if (VerticalScrollBarVisibility != ScrollBarVisibility.Never)
contentWidth -= ScrollBarWidth;
contentHeight = float.PositiveInfinity;
break;
case ScrollOrientation.Vertical:
default:
// Reserve space for vertical scrollbar to prevent horizontal scrollbar
contentWidth = float.IsInfinity(availableSize.Width) ? 800f : availableSize.Width;
if (VerticalScrollBarVisibility != ScrollBarVisibility.Never)
contentWidth -= ScrollBarWidth;
contentHeight = float.PositiveInfinity;
break;
}

View File

@ -287,14 +287,14 @@ public class SkiaShell : SkiaLayoutView
protected override SKSize MeasureOverride(SKSize availableSize)
{
// Measure current content
// Measure current content with padding accounted for (consistent with ArrangeOverride)
if (_currentContent != null)
{
float contentTop = NavBarIsVisible ? NavBarHeight : 0;
float contentBottom = TabBarIsVisible ? TabBarHeight : 0;
var contentSize = new SKSize(
availableSize.Width,
availableSize.Height - contentTop - contentBottom);
availableSize.Width - (float)Padding.Left - (float)Padding.Right,
availableSize.Height - contentTop - contentBottom - (float)Padding.Top - (float)Padding.Bottom);
_currentContent.Measure(contentSize);
}