From: John Hodge Date: Sat, 7 May 2011 13:41:10 +0000 (+0800) Subject: AxWin2 - Misc commenting changes (and moving Shell to new specs) X-Git-Tag: rel0.10~115 X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=338ddf3c1dc87e9e6f872e241e3f4486e80fe136;p=tpg%2Facess2.git AxWin2 - Misc commenting changes (and moving Shell to new specs) --- diff --git a/Usermode/Applications/axwin2_src/Shell_src/main.c b/Usermode/Applications/axwin2_src/Shell_src/main.c index aa939967..c0eeeec9 100644 --- a/Usermode/Applications/axwin2_src/Shell_src/main.c +++ b/Usermode/Applications/axwin2_src/Shell_src/main.c @@ -9,13 +9,15 @@ int Menubar_HandleMessage(tAxWin_Message *Message); // === GLOBALS === -tAxWin_Handle ghMenubarWindow; +tAxWin_Element geConsole; // === CODE === int main(int argc, char *argv[]) { AxWin_Register("Terminal"); + //geConsole = AxWin_CreateElement(); + AxWin_MessageLoop(); return 0; diff --git a/Usermode/Applications/axwin2_src/WM/interface.c b/Usermode/Applications/axwin2_src/WM/interface.c index 630b1f47..8d62c67d 100644 --- a/Usermode/Applications/axwin2_src/WM/interface.c +++ b/Usermode/Applications/axwin2_src/WM/interface.c @@ -35,31 +35,29 @@ void Interface_Init(void) // Set root window to no-border WM_SetFlags(NULL, 0); - // -- Create Sidebar -- + // -- Create Sidebar (Menu and Window List) -- gpInterface_Sidebar = WM_CreateElement(NULL, ELETYPE_TOOLBAR, ELEFLAG_VERTICAL, "Sidebar"); WM_SetSize( gpInterface_Sidebar, giInterface_Width ); // > System Menu Button btn = WM_CreateElement(gpInterface_Sidebar, ELETYPE_BUTTON, ELEFLAG_NOSTRETCH, "SystemMenu"); WM_SetSize(btn, giInterface_Width-4); - // TODO: Once image loading is implemented, switch to a logo - #if 1 - //text = WM_CreateElement(btn, ELETYPE_IMAGE, ELEFLAG_SCALE); + //text = WM_CreateElement(btn, ELETYPE_IMAGE, ELEFLAG_SCALE, "MenuLogo"); text = WM_CreateElement(btn, ELETYPE_IMAGE, 0, "MenuLogo"); //WM_SetText(text, "file:///LogoSmall.sif"); WM_SetText(text, csLogoSmall); - #else - text = WM_CreateElement(btn, ELETYPE_TEXT, 0, NULL); - WM_SetText(text, "Acess"); - #endif + // > Plain
style spacer ele = WM_CreateElement(gpInterface_Sidebar, ELETYPE_SPACER, ELEFLAG_NOSTRETCH, "SideBar Spacer Top"); WM_SetSize(ele, 4); - // > Application List + + // > Application List (Window list on most OSs) gpInterface_ProgramList = WM_CreateElement(gpInterface_Sidebar, ELETYPE_BOX, ELEFLAG_VERTICAL, "ProgramList"); + // > Plain
style spacer ele = WM_CreateElement(gpInterface_Sidebar, ELETYPE_SPACER, ELEFLAG_NOSTRETCH, "SideBar Spacer Bottom"); WM_SetSize(ele, 4); + // > Version/Time text = WM_CreateElement(gpInterface_Sidebar, ELETYPE_TEXT, ELEFLAG_NOSTRETCH, "Version String"); WM_SetSize(text, 20); diff --git a/Usermode/Applications/axwin2_src/WM/wm.h b/Usermode/Applications/axwin2_src/WM/wm.h index cd4ab90c..565697d7 100644 --- a/Usermode/Applications/axwin2_src/WM/wm.h +++ b/Usermode/Applications/axwin2_src/WM/wm.h @@ -71,12 +71,12 @@ enum eElementFlags /** * \brief Element visibility * - * If set, the element is not drawn. + * If set, the element is not drawn (but still is used for size calculations) */ ELEFLAG_INVISIBLE = 0x002, /** - * \brief Position an element absulutely + * \brief Position an element absulutely (ignored in size calcs) */ ELEFLAG_ABSOLUTEPOS = 0x004, @@ -87,6 +87,9 @@ enum eElementFlags /** * \brief Element "orientation" + * + * Vertical means that the children of this element are stacked, + * otherwise they list horizontally */ ELEFLAG_VERTICAL = 0x010,// ELEFLAG_HORIZONTAL = 0x000, /** @@ -105,7 +108,7 @@ enum eElementFlags /** * \brief With (length) size action * If this flag is set, the element will only be as large as - * is required + * is required along it's parent */ ELEFLAG_NOSTRETCH = 0x080, @@ -115,8 +118,11 @@ enum eElementFlags ELEFLAG_ALIGN_CENTER= 0x100, /** * \brief Right/Bottom alignment + * + * If set, the element aligns to the end of avaliable space (instead + * of the beginning) */ - ELEFLAG_ALIGN_END = 0x200 + ELEFLAG_ALIGN_END = 0x200 }; /** @@ -125,15 +131,16 @@ enum eElementTypes { ELETYPE_NONE, - ELETYPE_BOX, //!< Content box + ELETYPE_BOX, //!< Content box (invisible in itself) ELETYPE_TABBAR, //!< Tab Bar ELETYPE_TOOLBAR, //!< Tool Bar ELETYPE_BUTTON, //!< Push Button + ELETYPE_TEXT, //!< Text ELETYPE_IMAGE, //!< Image - ELETYPE_SPACER, //!< Visual Spacer + ELETYPE_SPACER, //!< Visual Spacer (horizontal / vertical rule) MAX_ELETYPES = 0x100 };