Fix an issue where combined buttons are ignored

Author: friendlyanon

Sajtkukac/Sajtkukac.cpp

@@ -49,13 +49,29 @@ static BSTR g_bstrs[3] = {
 
 HRESULT GetWidthOfChildren(BOOL vertical, IUIAutomationElement *taskList, UINT &result)
 {
-	CComPtr<IUIAutomationCondition> buttonCond;
-	CHK_HR(g_pUI->CreatePropertyCondition(UIA_ControlTypePropertyId,
-		CComVariant{ UIA_ButtonControlTypeId }, &buttonCond));
+	static const long buttonVariants[] = {
+		UIA_ButtonControlTypeId,
+		UIA_MenuItemControlTypeId
+	};
+
+	IUIAutomationCondition* conditions[2]{ nullptr, nullptr };
+	SCOPE_EXIT{ for (int i = 0; i < 2; ++i) RELEASE(conditions[i]); };
+	for (int i = 0; i < 2; ++i)
+	{
+		Z_PTR(IUIAutomationCondition, prop);
+		CHK_HR(g_pUI->CreatePropertyCondition(
+			UIA_ControlTypePropertyId, CComVariant{ buttonVariants[i] },
+			&prop));
+		conditions[i] = prop;
+	}
+
+	CComPtr<IUIAutomationCondition> orCondition;
+	CHK_HR(g_pUI->CreateOrConditionFromNativeArray(
+		conditions, 2, &orCondition));
 
 	CComPtr<IUIAutomationElementArray> children;
 	CHK_HR(taskList->FindAll(TreeScope_Children,
-		buttonCond, &children));
+		orCondition, &children));
 
 	INT length;
 	CHK_HR(children->get_Length(&length));

Sajtkukac/Sajtkukac.rc

@@ -41,7 +41,7 @@ UINT uPercentage;                      // position of the icons
 UINT uRefreshRate;                     // refresh rate in milliseconds
 UINT uEasingIdx;                       // index of the easing function
 PWORKER_DETAILS wdDetails = nullptr;   // struct to communicate with worker
-UINT uMajor = 0, uMinor = 5;           // current version
+UINT uMajor = 0, uMinor = 6;           // current version
 
 // TODO: fall back to system icons until someone makes one :)
 #ifndef IDI_SAJTKUKAC