Many changes, bugfixes to user vsnprintf and to escape code handling

[tpg/acess2.git] / Usermode / Applications / axwin2_src / WM / interface.c

diff --git a/Usermode/Applications/axwin2_src/WM/interface.c b/Usermode/Applications/axwin2_src/WM/interface.c
index 1eec6b4..3876b77 100644 (file)
--- a/Usermode/Applications/axwin2_src/WM/interface.c
+++ b/Usermode/Applications/axwin2_src/WM/interface.c
@@ -15,40 +15,45 @@ tElement    *gpInterface_TabContent;
 // === CODE ===
 void Interface_Init(void)
 {
+       tElement        *area;
        tElement        *btn, *text;
        
        giInterface_Width = giScreenWidth/16;
        
-       WM_SetFlags(NULL, ELEFLAG_HORIZONTAL);
+       WM_SetFlags(NULL, 0);
        
        // Create Sidebar
        gpInterface_Sidebar = WM_CreateElement(NULL, ELETYPE_TOOLBAR, ELEFLAG_VERTICAL);
        WM_SetSize( gpInterface_Sidebar, giInterface_Width );
        // Create Main Area and regions within
        gpInterface_MainArea = WM_CreateElement(NULL, ELETYPE_BOX, ELEFLAG_VERTICAL);
-       gpInterface_HeaderBar = WM_CreateElement(gpInterface_MainArea, ELETYPE_BOX, ELEFLAG_HORIZONTAL);
+       gpInterface_HeaderBar = WM_CreateElement(gpInterface_MainArea, ELETYPE_BOX, 0);
        gpInterface_TabBar = WM_CreateElement(gpInterface_MainArea, ELETYPE_TABBAR, 0);
        gpInterface_TabContent = WM_CreateElement(gpInterface_MainArea, ELETYPE_BOX, 0);
        
+       // Main segment of the "taskbar"
+       area = WM_CreateElement(gpInterface_Sidebar, ELETYPE_BOX, ELEFLAG_VERTICAL);
        // Menu Button
-       btn = WM_CreateElement(gpInterface_Sidebar, ELETYPE_BUTTON, 0);
+       btn = WM_CreateElement(area, ELETYPE_BUTTON, ELEFLAG_NOEXPAND);
        WM_SetSize(btn, giInterface_Width);
        //text = WM_CreateElement(btn, ELETYPE_IMAGE, ELEFLAG_SCALE);
-       //WM_SetText(text, "asset://LogoSmall.png");
+       //WM_SetText(text, "asset://LogoSmall.sif");
        text = WM_CreateElement(btn, ELETYPE_TEXT, 0);
        WM_SetText(text, "Acess");
        
        // Plain <hr/> style spacer
-       WM_CreateElement(gpInterface_Sidebar, ELETYPE_SPACER, 0);
+       WM_CreateElement(area, ELETYPE_SPACER, 0);
        
-       // Create spacing gap (aligns the rest to the bottom/right)
-       WM_CreateElement(gpInterface_Sidebar, ELETYPE_GAP, 0);
+       // Windows Go Here
+       
+       // Bottom Segment
+       area = WM_CreateElement(gpInterface_Sidebar, ELETYPE_BOX, ELEFLAG_VERTICAL|ELEFLAG_ALIGN_END);
        
        // Plain <hr/> style spacer
-       WM_CreateElement(gpInterface_Sidebar, ELETYPE_SPACER, 0);
+       WM_CreateElement(area, ELETYPE_SPACER, 0);
        
        // Version String
-       text = WM_CreateElement(gpInterface_Sidebar, ELETYPE_TEXT, ELEFLAG_WRAP);
+       text = WM_CreateElement(area, ELETYPE_TEXT, ELEFLAG_WRAP);
        WM_SetText(text, "AxWin 1.0");
 }