From 70a89ce4f8f406cc74c98218e58157186da502e5 Mon Sep 17 00:00:00 2001 From: Mark Date: Thu, 11 May 2017 21:52:20 +0200 Subject: [PATCH] GUI: More robust calculation --- planet/System.ocg/GUIs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/planet/System.ocg/GUIs.c b/planet/System.ocg/GUIs.c index c99f0215b..841fb4635 100644 --- a/planet/System.ocg/GUIs.c +++ b/planet/System.ocg/GUIs.c @@ -317,8 +317,8 @@ global func GuiCalculateGridElementPosition(proplist layout, int row, int column { grid_layout = {Prototype = layout}; cell_layout = {Prototype = layout}; - grid_layout.Rows = grid_layout.Rows ?? 1; - grid_layout.Columns = grid_layout.Columns ?? 1; + grid_layout.Rows = grid_layout.Rows; + grid_layout.Columns = grid_layout.Columns; } // determine position of the cell in the grid @@ -329,8 +329,8 @@ global func GuiCalculateGridElementPosition(proplist layout, int row, int column var cell_pos_y = cell_layout.Margin.Top + row * cell_height; // determine position of the grid - var grid_width = cell_width * grid_layout.Columns; - var grid_height = cell_height * grid_layout.Rows; + var grid_width = cell_width * (grid_layout.Columns ?? 1); + var grid_height = cell_height * (grid_layout.Rows ?? 1); var grid_position = GuiCalculateBoxElementPosition({Prototype = grid_layout, Width = grid_width, Height = grid_height});