CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/andreja6/G3D-Fun

Browse Source
This commit is contained in:
andreja6
2018-10-22 12:16:53 -07:00
parent eade3d8e93 ccf440a65e
commit b18ebfb56f
3 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
PropertyWindow.cpp
View File

@@ -49,22 +49,45 @@ bool PropertyWindow::onCreate(int x, int y, int sx, int sy, HMODULE hThisInstanc
PropGrid_ItemInit(pItem); PropGrid_ItemInit(pItem);
pItem.lpszCatalog="Test"; pItem.lpszCatalog="Test";
pItem.lpszPropName="Test2"; pItem.lpszPropName="Offset";
pItem.lpszzCmbItems="What"; pItem.lpszzCmbItems="What";
pItem.lpszPropDesc="Description"; pItem.lpszPropDesc="Description";
pItem.lpCurValue=0; pItem.lpCurValue=(LPARAM)"0, 0, 0";
pItem.iItemType=PIT_EDIT; pItem.iItemType=PIT_EDIT;
PROPGRIDITEM pItem2;
PropGrid_ItemInit(pItem2);
pItem2.lpszCatalog="Test";
pItem2.lpszPropName="s";
pItem2.lpszzCmbItems="itemlist\0itemlist2\0itemlist3";
pItem2.lpszPropDesc="";
pItem2.lpCurValue=0;
pItem2.iItemType=PIT_COMBO;
/*PROPGRIDITEM FauxExplorerItem;
PropGrid_ItemInit(FauxExplorerItem);
FauxExplorerItem.lpszCatalog="Test";
FauxExplorerItem.lpszPropName = "Editable Combo Field";
FauxExplorerItem.lpszzCmbItems = "Test1\0Test2\0Test3";
FauxExplorerItem.lpszPropDesc = "Press F4 to view drop down.";
FauxExplorerItem.iItemType = PIT_EDITCOMBO;
FauxExplorerItem.lpCurValue = 1;
PropGrid_AddItem(_propGrid, &FauxExplorerItem);*/
PropGrid_Enable(_propGrid,true); PropGrid_Enable(_propGrid,true);
ShowWindow(_propGrid,SW_SHOW); ShowWindow(_propGrid,SW_SHOW);
PropGrid_AddItem(_propGrid,&pItem); PropGrid_AddItem(_propGrid,&pItem);
PropGrid_AddItem(_propGrid,&pItem2);
PropGrid_SetItemHeight(_propGrid,20); PropGrid_SetItemHeight(_propGrid,20);
PropGrid_ShowToolTips(_propGrid,TRUE); PropGrid_ShowToolTips(_propGrid,TRUE);
PropGrid_ShowPropertyDescriptions(_propGrid,TRUE); PropGrid_ShowPropertyDescriptions(_propGrid,TRUE);
PropGrid_ExpandAllCatalogs(_propGrid); PropGrid_ExpandAllCatalogs(_propGrid);
SetWindowLongPtr(_propGrid,GWL_USERDATA,(LONG)this); SetWindowLongPtr(_propGrid,GWL_USERDATA,(LONG)this);
_redraw(_hwndProp); _redraw();
return true; return true;
} }
@@ -75,13 +98,12 @@ PropertyWindow::PropertyWindow(int x, int y, int sx, int sy, HMODULE hThisInstan
void PropertyWindow::onResize() void PropertyWindow::onResize()
{ {
_redraw(_hwndProp); _redraw();
} }
void PropertyWindow::_redraw(HWND hwnd) void PropertyWindow::_redraw()
{ {
RECT rect; RECT rect;
GetClientRect(hwnd,&rect); GetClientRect(_hwndProp,&rect);
SetWindowPos(_propGrid, NULL, 0, 0, rect.right, rect.bottom, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); SetWindowPos(_propGrid, NULL, 0, 20, rect.right, rect.bottom-20, SWP_NOZORDER | SWP_NOACTIVATE);
} }

2
PropertyWindow.h
View File

@@ -8,5 +8,5 @@ public:
private: private:
HWND _propGrid; HWND _propGrid;
HWND _hwndProp; HWND _hwndProp;
void _redraw(HWND hwnd); void _redraw();
}; };

2
main.cpp
View File

@@ -141,7 +141,7 @@ Demo::Demo(const GAppSettings& settings,HWND parentWindow) { //: GApp(settings,w
SetWindowLongPtr(_hWndMain,GWL_USERDATA,(LONG)this); SetWindowLongPtr(_hWndMain,GWL_USERDATA,(LONG)this);
SetWindowLongPtr(_hwndRenderer,GWL_USERDATA,(LONG)this); SetWindowLongPtr(_hwndRenderer,GWL_USERDATA,(LONG)this);
_propWindow = new PropertyWindow(0,0,200,640,hThisInstance); _propWindow = new PropertyWindow(0, 0, 200, 640, hThisInstance);
IEBrowser* webBrowser = new IEBrowser(_hwndToolbox); IEBrowser* webBrowser = new IEBrowser(_hwndToolbox);
webBrowser->navigateSyncURL(L"http://scottbeebiwan.tk/g3d/toolbox/"); webBrowser->navigateSyncURL(L"http://scottbeebiwan.tk/g3d/toolbox/");
} }