Continue expanding Start Menu implementation.

tthomps · tthomps · commit 1c211601b2a9 · 2020-06-30T11:27:41.000-04:00
Commit missing GUI_PopupMenu files.
diff --git a/MyOS_GUI_Shell/GUI_Object.h b/MyOS_GUI_Shell/GUI_Object.h
@@ -22,6 +22,7 @@ const SDL_Color SDL_DARKGRAY    = { 40, 40, 40, 255 };
 const uint32_t  RGB_BLACK = 0x000000;
 const SDL_Color SDL_WHITE = { 255, 255, 255, 255 };
 const SDL_Color SDL_DEFAULT_BUTTON_COLOR = { 200, 200, 200, 255 };
+const SDL_Color SDL_SYS_MENU_COLOR = { SYSTEM_MENU_COLOR_R, SYSTEM_MENU_COLOR_G, SYSTEM_MENU_COLOR_B, 255 };
 
 class GUI_Object
 {
diff --git a/MyOS_GUI_Shell/GUI_PopupMenu.cpp b/MyOS_GUI_Shell/GUI_PopupMenu.cpp
@@ -0,0 +1,150 @@
+#include "GUI_PopupMenu.h"
+#include "GUI_Window.h"
+#include "SDL_picofont.h"
+#include "MyOS_GUI_Shell.h"
+#include <string.h>
+
+GUI_PopupMenu::GUI_PopupMenu(GUI_Window *pOwner, MENU_HANDLER menuHandler, POPUP_TYPE popupType) : GUI_Control(pOwner, -1)
+{
+    choices = 0;
+    handlerCallback = menuHandler;
+    shown = false;
+    this->popupType = popupType;
+    pSurface = NULL;
+}
+
+GUI_PopupMenu::~GUI_PopupMenu()
+{
+}
+
+void GUI_PopupMenu::AddMenuItem(char * choiceText, int choiceID)
+{
+    choiceIDs[choices] = choiceID;
+    memset(choiceStrings[choices], 0, MENU_MAX_CHOICE_LENGTH);
+    strncpy(choiceStrings[choices++], choiceText, MENU_MAX_CHOICE_LENGTH - 1);
+
+    CreateSurface();
+}
+
+void GUI_PopupMenu::CreateSurface()
+{
+    if (pSurface)
+    {
+        SDL_FreeSurface;
+        pSurface = NULL;
+    }
+
+    // determine maximum width of menu
+    int maxChoiceLength = 1;
+    for (int i = 0; i < choices; ++i)
+    {
+        if (strlen(choiceStrings[i]) > maxChoiceLength)
+            maxChoiceLength = strlen(choiceStrings[i]);
+    }
+
+    int menuWidth = (maxChoiceLength * FNT_FONTWIDTH) + (2 * FNT_LEFTRIGHTMARGIN);
+    choiceHeight = FNT_FONTHEIGHT;
+    int menuHeight = (choices * choiceHeight) + ((choices - 1) * FNT_ROWSPACING) + (2 * FNT_TOPBOTTOMMARGIN);
+    
+    pSurface = SDL_CreateRGBSurface(0,
+                                    menuWidth,
+                                    menuHeight,
+                                    32,
+                                    0xFF000000,
+                                    0x00FF0000,
+                                    0x0000FF00,
+                                    0x000000FF);
+
+    dimensions.width = menuWidth;
+    dimensions.height = menuHeight;
+
+    Draw(-1);
+}
+
+void GUI_PopupMenu::Draw(int selectedChoice)
+{
+    // Fill the surface with the default color
+    FillSurface(pSurface, SDL_DEFAULT_BUTTON_COLOR);
+
+    // Draw the choices to the surface
+    SDL_Rect textDest = { FNT_LEFTRIGHTMARGIN, FNT_TOPBOTTOMMARGIN, 0, 0 };
+
+    int selectionY = FNT_TOPBOTTOMMARGIN;
+
+    for (int i = 0; i < choices; ++i)
+    {
+        SDL_Surface *pFont;
+
+        if (i == selectedChoice)
+        {
+            // Draw a box for the selection
+            SDL_Rect selectedDim = { 1, selectionY, dimensions.width - 3, choiceHeight };
+            SDL_FillRect(pSurface, &selectedDim, SDL_MapRGB(pSurface->format,
+                                                            SDL_SYS_MENU_COLOR.r,
+                                                            SDL_SYS_MENU_COLOR.g,
+                                                            SDL_SYS_MENU_COLOR.b));
+            // Draw the text in white
+            pFont = FNT_Render(choiceStrings[i], SDL_WHITE);
+        }
+        else
+        {
+            pFont = FNT_Render(choiceStrings[i], SDL_BLACK);
+            selectionY += choiceHeight + FNT_ROWSPACING;
+        } 
+
+        textDest.w = pFont->w;
+        textDest.h = pFont->h;
+
+        SDL_BlitSurface(pFont, NULL, pSurface, &textDest);
+
+        textDest.y += choiceHeight + FNT_ROWSPACING;
+
+        SDL_FreeSurface(pFont);
+    }
+
+    // Draw a border around the menu
+    Draw3D_Box(pSurface, 0, 0, dimensions.width, dimensions.height);
+}
+
+bool GUI_PopupMenu::MouseOver(int relX, int relY)
+{
+    if (relX < 0 || relY < 0 || relX > dimensions.width || relY > dimensions.height)
+    {
+        MessageBox("Menu called with mouse out of position\n", "ERROR");
+        return false;
+    }
+
+    // Highlight the appropriate option
+    int heightPerOption = dimensions.height / choices;
+    int selection = relY / heightPerOption;
+
+    Draw(selection);
+
+    return true;
+}
+
+void GUI_PopupMenu::PaintToSurface(SDL_Surface * pTargetSurface)
+{
+    if (!shown)
+        return;
+
+    SDL_BlitSurface(pSurface, NULL, pTargetSurface, dimensions.GetSDL_Rect());
+}
+
+void GUI_PopupMenu::RegisterMenuHandler(MENU_HANDLER handler)
+{
+    handlerCallback = handler;
+}
+
+void GUI_PopupMenu::ShowMenu(SDL_Point origin)
+{
+    if (!pSurface)
+        return;
+
+    dimensions.left = origin.x;
+    
+    if (popupType == ABOVE_AND_RIGHT_OF_ORIGIN)
+        dimensions.top = origin.y - dimensions.height;
+
+    shown = true;
+}
diff --git a/MyOS_GUI_Shell/GUI_PopupMenu.h b/MyOS_GUI_Shell/GUI_PopupMenu.h
@@ -0,0 +1,49 @@
+#pragma once
+#include "GUI_Control.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#define MENU_MAX_CHOICES        16
+#define MENU_MAX_CHOICE_LENGTH  32
+
+typedef enum POPUP_TYPE
+{
+    ABOVE_AND_RIGHT_OF_ORIGIN = 0
+}POPUP_TYPE;
+
+typedef void(*MENU_HANDLER)(int choiceID);
+
+class GUI_PopupMenu :
+    public GUI_Control
+{
+public:
+    GUI_PopupMenu(GUI_Window *pOwner, MENU_HANDLER menuHandler, POPUP_TYPE popupType);
+    ~GUI_PopupMenu();
+
+    void AddMenuItem(char *Choice, int choiceID);
+    void CreateSurface();
+    void Draw(int selectedChoice);
+    bool MouseOver(int relX, int relY);
+    void PaintToSurface(SDL_Surface *pTargetSurface);
+    void RegisterMenuHandler(MENU_HANDLER handler);
+    void ShowMenu(SDL_Point origin);
+
+    char choiceStrings[MENU_MAX_CHOICES][MENU_MAX_CHOICE_LENGTH];
+    int choiceIDs[MENU_MAX_CHOICES];
+    int choices;
+    MENU_HANDLER handlerCallback;
+    bool shown;
+    POPUP_TYPE popupType;
+    SDL_Surface *pSurface;
+
+protected:
+    int choiceHeight;
+};
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
diff --git a/MyOS_GUI_Shell/GUI_Taskbar.cpp b/MyOS_GUI_Shell/GUI_Taskbar.cpp
@@ -28,6 +28,9 @@ GUI_Taskbar::GUI_Taskbar(uint32_t desktopWidth, uint32_t desktopHeight) :
 
     // Create the start menu
     pStartMenu = new GUI_PopupMenu(this, StartMenuHandler, ABOVE_AND_RIGHT_OF_ORIGIN);
+
+    pStartMenu->AddMenuItem("Option 1", 1);
+    pStartMenu->AddMenuItem("Option 2", 2);
     pStartMenu->AddMenuItem("Run", 0);
 
     windowButtons = 0;
@@ -156,6 +159,19 @@ void GUI_Taskbar::PaintToSurface(SDL_Surface * pTargetSurface)
     pStartMenu->PaintToSurface(pTargetSurface);
 }
 
+// TODO: For now we assume the taskbar is always in the same position
+/*bool GUI_Taskbar::PointInBounds(int x, int y)
+{
+    if (GUI_Object::PointInBounds(x, y))
+        return true;
+
+    // Check start menu
+    if (pStartMenu->shown && pStartMenu->PointInBounds(x, y))
+        return true;
+
+    return false;
+}*/
+
 void GUI_Taskbar::RemoveWindow(uint32_t windowID)
 {
     // Find the control ID
diff --git a/MyOS_GUI_Shell/GUI_Taskbar.h b/MyOS_GUI_Shell/GUI_Taskbar.h
@@ -35,12 +35,13 @@ class GUI_Taskbar :
     void ControlClicked(uint32_t controlID);
     void OnDrag(int startRelX, int startRelY, int relX, int relY);
     void PaintToSurface(SDL_Surface *pTargetSurface);
+    //bool PointInBounds(int x, int y);
     void RemoveWindow(uint32_t windowID);
     void WindowActivated(uint32_t windowID);
+    GUI_PopupMenu *pStartMenu;
 
 protected:
     int windowButtons;
     GUI_TaskbarButton *pActiveWindowButton;
-    GUI_PopupMenu *pStartMenu;
 };
 
diff --git a/MyOS_GUI_Shell/MyOS_GUI_Shell.cpp b/MyOS_GUI_Shell/MyOS_GUI_Shell.cpp
@@ -500,6 +500,12 @@ int main(int argc, char* argv[])
                         oldMousePos.x = cursorRect.x;
                         oldMousePos.y = cursorRect.y;
                     }
+                    else
+                    {
+                        if (pTaskbar->pStartMenu->PointInBounds(cursorRect.x, cursorRect.y))
+                            pTaskbar->pStartMenu->MouseOver(cursorRect.x - pTaskbar->pStartMenu->dimensions.left,
+                                                            cursorRect.y - pTaskbar->pStartMenu->dimensions.top);
+                    }
 
                     break;
 
@@ -516,6 +522,12 @@ int main(int argc, char* argv[])
                                 pTaskbar->OnClick(cursorRect.x, cursorRect.y - pTaskbar->dimensions.top);
                                 pDraggedWindow = pTaskbar;
                             }
+                            // What about the start menu?
+                            else if (pTaskbar->pStartMenu->PointInBounds(cursorRect.x, cursorRect.y))
+                            {
+                                pTaskbar->pStartMenu->OnClick(cursorRect.x - pTaskbar->pStartMenu->dimensions.left,
+                                                              cursorRect.y - pTaskbar->pStartMenu->dimensions.top);
+                            }
                             else if (pStackEntryUnderCursor)
                             {
                                 BringWindowToFront(pStackEntryUnderCursor);// ->pWindow->SetBackgroundColor(red);

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ const SDL_Color SDL_DARKGRAY = { 40, 40, 40, 255 };`
`22`	`22`	`const uint32_t RGB_BLACK = 0x000000;`
`23`	`23`	`const SDL_Color SDL_WHITE = { 255, 255, 255, 255 };`
`24`	`24`	`const SDL_Color SDL_DEFAULT_BUTTON_COLOR = { 200, 200, 200, 255 };`
	`25`	`+const SDL_Color SDL_SYS_MENU_COLOR = { SYSTEM_MENU_COLOR_R, SYSTEM_MENU_COLOR_G, SYSTEM_MENU_COLOR_B, 255 };`
`25`	`26`
`26`	`27`	`class GUI_Object`
`27`	`28`	`{`