jp9000
/
obs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved config menu item to AppendModifyListbox

master
Eric Bataille 2013-07-17 17:33:41 +02:00
parent 07970e09f1
commit ae285dd10b
3 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/OBS.h
View File

@ -770,6 +770,7 @@ private:
//---------------------------------------------------
void AppendModifyListbox(HWND hwnd, HMENU hMenu, int id, int numItems, bool bSelected);
void TrackModifyListbox(HWND hwnd, int ret);
void DeleteItems();

44
Source/WindowStuff.cpp
View File

@ -383,7 +383,7 @@ LRESULT CALLBACK OBS::ListboxHook(HWND hwnd, UINT message, WPARAM wParam, LPARAM
bSelected = ListView_GetSelectedCount(hwnd) != 0;
}
AppendModifyListbox(hwnd, hMenu, id, numItems, bSelected);
App->AppendModifyListbox(hwnd, hMenu, id, numItems, bSelected);
POINT p;
GetCursorPos(&p);
@ -665,26 +665,6 @@ LRESULT CALLBACK OBS::ListboxHook(HWND hwnd, UINT message, WPARAM wParam, LPARAM
if(selectedSceneItems.Num() < 1)
nop();
UINT numSelected = (ListView_GetSelectedCount(hwnd));
XElement *selectedElement = NULL;
ClassInfo *curClassInfo = NULL;
if(numSelected == 1)
{
UINT selectedID = ListView_GetNextItem(hwnd, -1, LVNI_SELECTED);
XElement *sourcesElement = App->sceneElement->GetElement(TEXT("sources"));
selectedElement = sourcesElement->GetElementByID(selectedID);
curClassInfo = App->GetImageSourceClass(selectedElement->GetString(TEXT("class")));
if(curClassInfo && curClassInfo->configProc)
{
AppendMenu(hMenu, MF_SEPARATOR, 0, 0);
AppendMenu(hMenu, MF_STRING, ID_LISTBOX_CONFIG, Str("Listbox.Config"));
}
}
int ret = (int)TrackPopupMenuEx(hMenu, TPM_RETURNCMD | TPM_LEFTALIGN | TPM_RIGHTBUTTON, p.x, p.y, hwndMain, NULL);
App->TrackModifyListbox(hwnd, ret);
}
@ -984,7 +964,7 @@ void OBS::TrackModifyListbox(HWND hwnd, int ret)
}
}
void AppendModifyListbox(HWND hwnd, HMENU hMenu, int id, int numItems, bool bSelected)
void OBS::AppendModifyListbox(HWND hwnd, HMENU hMenu, int id, int numItems, bool bSelected)
{
if(numItems && bSelected)
{
@ -1069,6 +1049,24 @@ void AppendModifyListbox(HWND hwnd, HMENU hMenu, int id, int numItems, bool bSel
AppendMenu(hmenuPositioning, MF_STRING, ID_LISTBOX_MOVEBOTTOM, strMoveBottomOfCanvas);
AppendMenu(hMenu, MF_STRING|MF_POPUP, (UINT_PTR)hmenuPositioning, strPositionSize.Array());
UINT numSelected = (ListView_GetSelectedCount(hwnd));
XElement *selectedElement = NULL;
ClassInfo *curClassInfo = NULL;
if(numSelected == 1)
{
UINT selectedID = ListView_GetNextItem(hwnd, -1, LVNI_SELECTED);
XElement *sourcesElement = App->sceneElement->GetElement(TEXT("sources"));
selectedElement = sourcesElement->GetElementByID(selectedID);
curClassInfo = App->GetImageSourceClass(selectedElement->GetString(TEXT("class")));
if(curClassInfo && curClassInfo->configProc)
{
AppendMenu(hMenu, MF_SEPARATOR, 0, 0);
AppendMenu(hMenu, MF_STRING, ID_LISTBOX_CONFIG, Str("Listbox.Config"));
}
}
}
}
}
@ -3858,7 +3856,7 @@ LRESULT CALLBACK OBS::RenderFrameProc(HWND hwnd, UINT message, WPARAM wParam, LP
bool bSelected = ListView_GetSelectedCount(hwndSources) != 0;
if (App->IsRunning())
AppendModifyListbox(hwndSources, hPopup, ID_SOURCES, numItems, bSelected);
App->AppendModifyListbox(hwndSources, hPopup, ID_SOURCES, numItems, bSelected);
POINT p;
GetCursorPos(&p);

1
Source/WindowStuff.h
View File

@ -20,4 +20,3 @@
#pragma once
int SetSliderText(HWND hwndParent, int controlSlider, int controlText);
void AppendModifyListbox(HWND hwnd, HMENU hMenu, int id, int numItems, bool bSelected);