vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Menu creation WIP

Browse Source
This commit is contained in:
Daniel Collin 2013-01-07 16:30:38 +01:00
parent b8169418f2
commit be24e30d8f
2 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ogl_editor/emgui/src/FontLayout.h
View File

@ -1,19 +0,0 @@
#pragma once
#include "Types.h"
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
typedef struct EmguiFontLayout
{
int16_t id;
int16_t x;
int16_t y;
int16_t width;
int16_t height;
int16_t xoffset;
int16_t yoffset;
int16_t xadvance;
} EmguiFontLayout;

29
ogl_editor/src/windows/RocketWindow.c
View File

@ -3,11 +3,14 @@
#include <gl/gl.h> #include <gl/gl.h>
#include "../Editor.h" #include "../Editor.h"
#include "resource.h" #include "resource.h"
#include "Menu.h"
#include "afxres.h" #include "afxres.h"
#include <string.h> #include <string.h>
#include <emgui/emgui.h> #include <emgui/emgui.h>
#include <emgui/gfxbackend.h> #include <emgui/gfxbackend.h>
void Window_buildMenu();
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
static HWND s_window; static HWND s_window;
@ -96,7 +99,7 @@ bool createWindow(const wchar_t* title, int width, int height)
wc.lpszClassName = L"RocketEditor"; wc.lpszClassName = L"RocketEditor";
wc.hIcon = LoadIcon(s_instance, IDI_APPLICATION); wc.hIcon = LoadIcon(s_instance, IDI_APPLICATION);
wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hCursor = LoadCursor(NULL, IDC_ARROW);
wc.lpszMenuName = MAKEINTRESOURCE(IDR_MENU); //wc.lpszMenuName = MAKEINTRESOURCE(IDR_MENU);
if (!RegisterClass(&wc)) if (!RegisterClass(&wc))
{ {
@ -147,6 +150,9 @@ bool createWindow(const wchar_t* title, int width, int height)
return FALSE; return FALSE;
} }
Window_buildMenu();
ShowWindow(s_window, SW_SHOW); ShowWindow(s_window, SW_SHOW);
SetForegroundWindow(s_window); SetForegroundWindow(s_window);
SetFocus(s_window); SetFocus(s_window);
@ -157,16 +163,17 @@ bool createWindow(const wchar_t* title, int width, int height)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/* static void buildSubMenu(HMENU parentMenu, MenuDescriptor menuDesc[], wchar_t* name)
static void buildSubMenu(HMENU menu, MenuDescriptor menuDesc[])
{ {
MenuDescriptor* desc = &menuDesc[0]; MenuDescriptor* desc = &menuDesc[0];
HMENU menu = CreatePopupMenu();
AppendMenu(parentMenu, MF_STRING | MF_POPUP, (UINT)menu, name);
while (desc->name) while (desc->name)
{ {
if (desc->id == EDITOR_MENU_SEPARATOR) if (desc->id == EDITOR_MENU_SEPARATOR)
{ {
AppendMenu(MF_SEPARATOR, NULL, "-"); AppendMenu(menu, MF_SEPARATOR, 0, L"-");
} }
else if (desc->id == EDITOR_MENU_SUB_MENU) else if (desc->id == EDITOR_MENU_SUB_MENU)
{ {
@ -175,22 +182,24 @@ static void buildSubMenu(HMENU menu, MenuDescriptor menuDesc[])
else else
{ {
//&New\tCtrl+N //&New\tCtrl+N
AppendMenu(hSubMenu, MF_STRING, desc->id, "&Go"); AppendMenu(menu, MF_STRING, desc->id, desc->name);
} }
desc++;
} }
} }
*/
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/*
void Window_buildMenu() void Window_buildMenu()
{ {
HMENU menu = GetMenu(s_window); HMENU mainMenu = CreateMenu();
buildSubMenu(mainMenu, g_fileMenu, L"&File");
buildSubMenu(mainMenu, g_editMenu, L"&Edit");
buildSubMenu(mainMenu, g_viewMenu, L"&View");
SetMenu(s_window, mainMenu);
} }
*/
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////