Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 14:53:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RAPPS]

Browse source 
- Fix info display on selection change. Patch by Carlo Bramini.
CORE-6139 #resolve

svn path=/trunk/; revision=61043
This commit is contained in:
Thomas Faber 2013-11-18 20:24:18 +00:00
parent db3348fa71
commit 24536fac9a
2 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/base/applications/rapps/listview.c
View file

@ -103,7 +103,7 @@ CreateListView(HWND hwnd)
hListView = CreateWindowExW(WS_EX_CLIENTEDGE, hListView = CreateWindowExW(WS_EX_CLIENTEDGE,
WC_LISTVIEWW, WC_LISTVIEWW,
L"", L"",
WS_CHILD | WS_VISIBLE | LVS_SORTASCENDING | LVS_REPORT | LVS_SINGLESEL, WS_CHILD | WS_VISIBLE | LVS_SORTASCENDING | LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS,
205, 28, 465, 250, 205, 28, 465, 250,
hwnd, hwnd,
NULL, NULL,

38
reactos/base/applications/rapps/winmain.c
View file

@ -73,7 +73,7 @@ SaveSettings(HWND hwnd)
if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"Software\\ReactOS\\rapps", 0, NULL, if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"Software\\ReactOS\\rapps", 0, NULL,
REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS)
{ {
RegSetValueEx(hKey, L"Settings", 0, REG_BINARY, (LPBYTE)&SettingsInfo, sizeof(SETTINGS_INFO)); RegSetValueExW(hKey, L"Settings", 0, REG_BINARY, (LPBYTE)&SettingsInfo, sizeof(SETTINGS_INFO));
RegCloseKey(hKey); RegCloseKey(hKey);
} }
} }
@ -631,21 +631,31 @@ MainWindowProc(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lParam)
} }
break; break;
case LVN_KEYDOWN: case LVN_ITEMCHANGED:
{ {
LPNMLVKEYDOWN pnkd = (LPNMLVKEYDOWN) lParam; LPNMLISTVIEW pnic = (LPNMLISTVIEW) lParam;
if (pnkd->hdr.hwndFrom == hListView) if (pnic->hdr.hwndFrom == hListView)
{ {
INT ItemIndex = (INT) SendMessage(hListView, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); /* Check if this is a valid item
* (technically, it can be also an unselect) */
INT ItemIndex = pnic->iItem;
if (ItemIndex == -1 ||
ItemIndex >= ListView_GetItemCount(pnic->hdr.hwndFrom))
{
break;
}
if (pnkd->wVKey == VK_UP) ItemIndex -= 1; /* Check if the focus has been moved to another item */
if (pnkd->wVKey == VK_DOWN) ItemIndex += 1; if ((pnic->uChanged & LVIF_STATE) &&
(pnic->uNewState & LVIS_FOCUSED) &&
if (IS_INSTALLED_ENUM(SelectedEnumType)) !(pnic->uOldState & LVIS_FOCUSED))
ShowInstalledAppInfo(ItemIndex); {
if (IS_AVAILABLE_ENUM(SelectedEnumType)) if (IS_INSTALLED_ENUM(SelectedEnumType))
ShowAvailableAppInfo(ItemIndex); ShowInstalledAppInfo(ItemIndex);
if (IS_AVAILABLE_ENUM(SelectedEnumType))
ShowAvailableAppInfo(ItemIndex);
}
} }
} }
break; break;
@ -763,7 +773,7 @@ wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nSh
WCHAR szErrorText[MAX_STR_LEN]; WCHAR szErrorText[MAX_STR_LEN];
HANDLE hMutex = NULL; HANDLE hMutex = NULL;
MSG Msg; MSG Msg;
switch (GetUserDefaultUILanguage()) switch (GetUserDefaultUILanguage())
{ {
case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT):
@ -773,7 +783,7 @@ wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nSh
default: default:
break; break;
} }
hInst = hInstance; hInst = hInstance;
if (!IsUserAnAdmin()) if (!IsUserAnAdmin())