From db2f529599cea4c86481ed6ca650a5b069c003b0 Mon Sep 17 00:00:00 2001
From: Jonas Kümmerlin <jonas@kuemmerlin.eu>
Date: Sat, 5 Jan 2019 22:07:51 +0100
Subject: move layout into own file, implement expand flag

---
 alf/alfpriv.h | 39 ++++++---------------------------------
 1 file changed, 6 insertions(+), 33 deletions(-)

(limited to 'alf/alfpriv.h')

diff --git a/alf/alfpriv.h b/alf/alfpriv.h
index 95bcda4..acea53a 100644
--- a/alf/alfpriv.h
+++ b/alf/alfpriv.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include "alf.h"
 
 #include <windows.h>
@@ -13,45 +15,13 @@
 
 #include "alflist.h"
 #include "alfcompat.h"
-
-typedef struct {
-    ALFListHeader list;
-    HWND hwnd;
-    UINT x;
-    UINT y;
-    UINT cptWidth;
-    UINT cptHeight;
-    UINT cptMarginTop;
-    UINT cptMarginRight;
-    UINT cptMarginBottom;
-    UINT cptMarginLeft;
-    DWORD flags;
-} ALFWidgetPriv;
-
-typedef struct {
-    int minWidth;
-    int allocatedWidth;
-    int allocatedPosition;
-    int expand : 1;
-} ALFRowOrColumn;
-
-typedef struct {
-    ALFRowOrColumn *columns;
-    ALFRowOrColumn *rows;
-    int             nColumns;
-    int             nRows;
-    int             totalMinWidth;
-    int             totalMinHeight;
-    int             occupiedColumnCount;
-    int             occupiedRowCount;
-} ALFLayout;
+#include "alflayout.h"
 
 typedef struct {
     ALFAPP              app;
     ALFWindowVTable    *vtbl;
     void               *closure;
     ALFWindowFonts      fonts;
-    ALFListHeader       widgets;
     int                 modalResult;
     ALFLayout           layout;
     WORD                defid;
@@ -64,6 +34,9 @@ struct ALFAppPriv {
     TCHAR              *comboClass;
 };
 
+int
+ALF_CentipointsToPxPriv(ALFWindowPriv *priv, int cptValue);
+
 void
 ALF_UpdateFontsPriv(HWND hwnd, ALFWindowPriv *priv);
 
-- 
cgit v1.2.3