From e0fcaf1f5377b1342cb37a632241dc41e10a9ae2 Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Sun, 22 Sep 2024 23:22:23 +0200 Subject: [PATCH] Services: Fix spacing in tool tip grids --- Elwig/Services/AreaComService.cs | 2 +- Elwig/Services/DeliveryService.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Elwig/Services/AreaComService.cs b/Elwig/Services/AreaComService.cs index 994a7e5..c6df782 100644 --- a/Elwig/Services/AreaComService.cs +++ b/Elwig/Services/AreaComService.cs @@ -242,8 +242,8 @@ namespace Elwig.Services { AddToolTipCell(grid, "Lieferrecht", 0, 4, 1, false, false, true); int rowNum = 1; foreach (var row in data) { + if (rowNum == 2 || (rowNum != 1 && row.Item1 != null)) rowNum++; AddToolTipRow(grid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5); - if (rowNum == 2) rowNum++; } return grid; } diff --git a/Elwig/Services/DeliveryService.cs b/Elwig/Services/DeliveryService.cs index babe4f9..3de96c5 100644 --- a/Elwig/Services/DeliveryService.cs +++ b/Elwig/Services/DeliveryService.cs @@ -830,8 +830,8 @@ namespace Elwig.Services { wGrid.ColumnDefinitions.Add(new() { Width = new(50) }); int rowNum = 0; foreach (var row in weightData) { + if (rowNum == 1 || (rowNum != 0 && row.Item1 != null)) rowNum++; AddWeightToolTipRow(wGrid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5); - if (rowNum == 1) rowNum++; } var gGrid = new Grid(); @@ -845,8 +845,8 @@ namespace Elwig.Services { AddToolTipCell(gGrid, "Max.", 0, 4, 1, false, false, true); rowNum = 1; foreach (var row in gradationData) { + if (rowNum == 2 || (rowNum != 1 && row.Item1 != null)) rowNum++; AddGradationToolTipRow(gGrid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5); - if (rowNum == 2) rowNum++; } return (wGrid, gGrid);