Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Fix georges editor

Browse Source
develop
kaetemi 5 years ago
parent ec61fa02b6
commit 3cbfa82a6e
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File

2
ryzom/tools/leveldesign/georges_dll/file_tree_view.cpp
Unescape Escape View File

@ -187,7 +187,7 @@ BOOL CFileTreeCtrl::OnNotify ( WPARAM wParam, LPARAM lParam, LRESULT* pResult )
{ {
LPNMHDR pnmh = (LPNMHDR) lParam; LPNMHDR pnmh = (LPNMHDR) lParam;
// Tree ? // Tree ?
if (wParam == 0) // if (wParam == 0)
{ {
switch (pnmh->code) switch (pnmh->code)
{ {

23
ryzom/tools/leveldesign/georges_dll/form_dialog.cpp
Unescape Escape View File

@ -720,6 +720,8 @@ void CFormDialog::onLastFocus ()
int CFormDialog::getWidget (uint dialogId) const int CFormDialog::getWidget (uint dialogId) const
{ {
if (dialogId == 0xFFFE)
dialogId = 0;
for (uint i=0; i<Widgets.size(); i++) for (uint i=0; i<Widgets.size(); i++)
{ {
if (Widgets[i]->isDialog (dialogId)) if (Widgets[i]->isDialog (dialogId))
@ -1198,6 +1200,11 @@ void CFormDialog::onGetSubFocus (uint id)
{ {
// Get the widget // Get the widget
int widget = getWidget (id); int widget = getWidget (id);
if (widget < 0)
{
nldebug("Invalid widget id %d", (int)id);
return;
}
WidgetFocused = widget; WidgetFocused = widget;
// Window view // Window view
@ -1584,7 +1591,7 @@ void CFormMemCombo::create (DWORD wStyle, RECT &currentPos, CFormDialog *parent,
{ {
// Create the mem combobox // Create the mem combobox
parent->setComboSpinSize (currentPos); parent->setComboSpinSize (currentPos);
Combo.create (WS_CHILD|WS_TABSTOP, currentPos, parent, dialog_index, reg, theApp.RememberListSize); Combo.create (WS_CHILD|WS_TABSTOP, currentPos, parent, dialog_index ? dialog_index : 0xFFFE, reg, theApp.RememberListSize);
parent->initWidget (Combo); parent->initWidget (Combo);
// Create the spin // Create the spin
@ -1599,7 +1606,7 @@ void CFormMemCombo::create (DWORD wStyle, RECT &currentPos, CFormDialog *parent,
{ {
// Create the mem combobox // Create the mem combobox
parent->setComboBrowseSize (currentPos); parent->setComboBrowseSize (currentPos);
Combo.create (WS_CHILD|WS_TABSTOP, currentPos, parent, dialog_index, reg, theApp.RememberListSize); Combo.create (WS_CHILD|WS_TABSTOP, currentPos, parent, dialog_index ? dialog_index : 0xFFFE, reg, theApp.RememberListSize);
parent->initWidget (Combo); parent->initWidget (Combo);
// Create the spin // Create the spin
@ -1621,7 +1628,7 @@ void CFormMemCombo::create (DWORD wStyle, RECT &currentPos, CFormDialog *parent,
{ {
// Create the mem combobox // Create the mem combobox
parent->setComboSize (currentPos, parent->SmallWidget); parent->setComboSize (currentPos, parent->SmallWidget);
Combo.create (WS_CHILD|WS_TABSTOP, currentPos, parent, dialog_index, reg, theApp.RememberListSize); Combo.create (WS_CHILD|WS_TABSTOP, currentPos, parent, dialog_index ? dialog_index : 0xFFFE, reg, theApp.RememberListSize);
parent->initWidget (Combo); parent->initWidget (Combo);
parent->getNextPos (currentPos); parent->getNextPos (currentPos);
} }
@ -1914,7 +1921,7 @@ void CFormCombo::create (DWORD wStyle, RECT &currentPos, CFormDialog *parent, ui
parent->setComboSize (currentPos, parent->SmallWidget); parent->setComboSize (currentPos, parent->SmallWidget);
RECT comboPos = currentPos; RECT comboPos = currentPos;
parent->adjusteComboSize (comboPos); parent->adjusteComboSize (comboPos);
Combo.Create (WS_CHILD|WS_VSCROLL|WS_VISIBLE|CBS_DROPDOWNLIST|CBS_HASSTRINGS|WS_CHILD|WS_TABSTOP, comboPos, parent, dialog_index); Combo.Create (WS_CHILD|WS_VSCROLL|WS_VISIBLE|CBS_DROPDOWNLIST|CBS_HASSTRINGS|WS_CHILD|WS_TABSTOP, comboPos, parent, dialog_index ? dialog_index : 0xFFFE);
parent->initWidget (Combo); parent->initWidget (Combo);
parent->getNextPos (currentPos); parent->getNextPos (currentPos);
@ -2097,7 +2104,7 @@ void CFormBigEdit::create (DWORD wStyle, RECT &currentPos, CFormDialog *parent,
// Create the mem combobox // Create the mem combobox
parent->setBigEditSize (currentPos, parent->SmallWidget); parent->setBigEditSize (currentPos, parent->SmallWidget);
Edit.CreateEx (WS_EX_CLIENTEDGE, _T("EDIT"), _T(""), WS_VSCROLL|ES_OEMCONVERT|ES_MULTILINE|ES_WANTRETURN|WS_CHILD|WS_VISIBLE|WS_TABSTOP|ES_AUTOHSCROLL|ES_AUTOVSCROLL, currentPos, parent, dialog_index); Edit.CreateEx (WS_EX_CLIENTEDGE, _T("EDIT"), _T(""), WS_VSCROLL|ES_OEMCONVERT|ES_MULTILINE|ES_WANTRETURN|WS_CHILD|WS_VISIBLE|WS_TABSTOP|ES_AUTOHSCROLL|ES_AUTOVSCROLL, currentPos, parent, dialog_index ? dialog_index : 0xFFFE);
parent->initWidget (Edit); parent->initWidget (Edit);
parent->getNextPos (currentPos); parent->getNextPos (currentPos);
@ -2271,7 +2278,7 @@ void CColorEdit::create (DWORD wStyle, RECT &currentPos, CFormDialog *parent, ui
// Create the mem combobox // Create the mem combobox
parent->setColorSize (currentPos, parent->SmallWidget); parent->setColorSize (currentPos, parent->SmallWidget);
Color.create (WS_CHILD|WS_VISIBLE|WS_TABSTOP, currentPos, parent, dialog_index); Color.create (WS_CHILD|WS_VISIBLE|WS_TABSTOP, currentPos, parent, dialog_index ? dialog_index : 0xFFFE);
parent->initWidget (Color); parent->initWidget (Color);
// Create the reset button // Create the reset button
@ -2501,7 +2508,7 @@ void CListWidget::create (DWORD wStyle, RECT &currentPos, CFormDialog *parent, u
// Create the mem combobox // Create the mem combobox
parent->setListSize (currentPos, parent->SmallWidget); parent->setListSize (currentPos, parent->SmallWidget);
ListCtrl.create (WS_CHILD|WS_VISIBLE|WS_TABSTOP, currentPos, parent, dialog_index); ListCtrl.create (WS_CHILD|WS_VISIBLE|WS_TABSTOP, currentPos, parent, dialog_index ? dialog_index : 0xFFFE);
parent->initWidget (ListCtrl); parent->initWidget (ListCtrl);
parent->getNextPos (currentPos); parent->getNextPos (currentPos);
@ -2759,7 +2766,7 @@ void CIconWidget::create (DWORD wStyle, RECT &currentPos, CFormDialog *parent, u
// Create the mem combobox // Create the mem combobox
parent->setEditSize (currentPos, parent->IconHeight, parent->IconHeight); parent->setEditSize (currentPos, parent->IconHeight, parent->IconHeight);
Icon.create (WS_CHILD|WS_VISIBLE|WS_TABSTOP, currentPos, parent, dialog_index); Icon.create (WS_CHILD|WS_VISIBLE|WS_TABSTOP, currentPos, parent, dialog_index ? dialog_index : 0xFFFE);
parent->initWidget (Icon); parent->initWidget (Icon);
parent->getNextPos (currentPos); parent->getNextPos (currentPos);

Write Preview
Loading…
Cancel
Save