Merge pull request #29 from wuwao1/master

fix CListUI::AddAt && CListUI::Remove && CListUI::RemoveAt

.github/workflows/msbuild.yml

@@ -0,0 +1,44 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: MSBuild
+
+on:
+ push:
+ branches: [ "master" ]
+ pull_request:
+ branches: [ "master" ]
+
+env:
+ # Path to the solution file relative to the root of the project.
+ SOLUTION_FILE_PATH: .
+
+ # Configuration type to build.
+ # You can convert this to a build matrix if you need coverage of multiple configuration types.
+ # https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+ BUILD_CONFIGURATION: Release
+
+permissions:
+ contents: read
+
+jobs:
+ build:
+ runs-on: windows-latest
+
+ steps:
+ - uses: actions/checkout@v3
+
+ - name: Add MSBuild to PATH
+ uses: microsoft/[email protected]
+
+ - name: Restore NuGet packages
+ working-directory: ${{env.GITHUB_WORKSPACE}}
+ run: nuget restore ${{env.SOLUTION_FILE_PATH}}
+
+ - name: Build
+ working-directory: ${{env.GITHUB_WORKSPACE}}
+ # Add additional options to the MSBuild command line here (like platform or verbosity level).
+ # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
+ run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}

DuiLib/Control/UIList.cpp

@@ -156,6 +156,18 @@ namespace DuiLib {
  }
  }
  if (m_iCurSel >= iIndex) m_iCurSel += 1;
+
+ std::vector<int> VecTempSelIndex;
+ for (auto i = 0; i < m_aSelItems.GetSize(); i++)
+ {
+ int iSelIndex = (int)m_aSelItems.GetAt(i);
+ if (iSelIndex >= iIndex)iSelIndex++;
+ VecTempSelIndex.push_back(iSelIndex);
+ }
+ m_aSelItems.Empty();
+ for (size_t i = 0; i < VecTempSelIndex.size(); i++)
+ m_aSelItems.Add((void*)VecTempSelIndex[i]);
+
  return true;
  }
 
@@ -177,6 +189,18 @@ namespace DuiLib {
  }
  }
 
+ std::vector<int> VecTempSelIndex;
+ for (auto i = 0; i < m_aSelItems.GetSize(); i++)
+ {
+ int iSelIndex = (int)m_aSelItems.GetAt(i);
+ if (iSelIndex == iIndex)continue;
+ if (iSelIndex > iIndex)iSelIndex--;
+ VecTempSelIndex.push_back(iSelIndex);
+ }
+ m_aSelItems.Empty();
+ for (size_t i = 0; i < VecTempSelIndex.size(); i++)
+ m_aSelItems.Add((void*)VecTempSelIndex[i]);
+
  if (iIndex == m_iCurSel && m_iCurSel >= 0) {
  int iSel = m_iCurSel;
  m_iCurSel = -1;
@@ -194,6 +218,18 @@ namespace DuiLib {
  if (pListItem) pListItem->SetIndex (i);
  }
 
+ std::vector<int> VecTempSelIndex;
+ for (auto i = 0; i < m_aSelItems.GetSize(); i++)
+ {
+ int iSelIndex = (int)m_aSelItems.GetAt(i);
+ if (iSelIndex == iIndex)continue;
+ if (iSelIndex > iIndex)iSelIndex--;
+ VecTempSelIndex.push_back(iSelIndex);
+ }
+ m_aSelItems.Empty();
+ for (size_t i = 0; i < VecTempSelIndex.size(); i++)
+ m_aSelItems.Add((void*)VecTempSelIndex[i]);
+
  if (iIndex == m_iCurSel && m_iCurSel >= 0) {
  int iSel = m_iCurSel;
  m_iCurSel = -1;

DuiLib/Utils/WinImplBase.h

@@ -46,6 +46,12 @@ namespace DuiLib {
  virtual CControlUI* CreateControl (faw::string_t pstrClass);
  LRESULT Invoke (std::function<LRESULT ()> f) { return ::SendMessage (m_hWnd, WM_USER + 0x101, 1, (LPARAM) &f); }
  void AsyncInvoke (std::function<LRESULT ()> f) { ::PostMessage (m_hWnd, WM_USER + 0x101, 0, (LPARAM) new decltype (f) (f)); }
+ template<typename Func, typename... Args>
+ void AsyncInvoke(Func func, Args... args) {
+ auto boundFunc = std::bind(func, args...);
+ auto* funcPtr = new std::function<decltype(func(args...))()>(boundFunc);
+ ::PostMessage(m_hWnd, WM_USER + 0x101, 0, reinterpret_cast<LPARAM>(funcPtr));
+ }
  virtual faw::string_t QueryControlText (faw::string_t lpstrId, faw::string_t lpstrType);
 
  virtual std::optional<LRESULT> MessageHandler (UINT uMsg, WPARAM wParam, LPARAM /*lParam*/);