Remove unused preferred size for navigation tabs

refs #507 - Clean up use of D2D1_{RECT,SIZE,POINT}_* except at D2D boundaries
OpenKneeboard · May 22, 2024 · 2d53c92 · 2d53c92
1 parent f598f3e
commit 2d53c92
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/src/app/app-common/Tab/NavigationTab.cpp b/src/app/app-common/Tab/NavigationTab.cpp
@@ -36,18 +36,17 @@ bool NavigationTab::Button::operator==(
 NavigationTab::NavigationTab(
   const audited_ptr<DXResources>& dxr,
   const std::shared_ptr<ITab>& rootTab,
-  const std::vector<NavigationEntry>& entries,
-  const D2D1_SIZE_U& _ignoredPreferredSize)
+  const std::vector<NavigationEntry>& entries)
   : TabBase(winrt::guid {}, rootTab->GetTitle()),
     mDXR(dxr),
     mRootTab(rootTab),
     mPreferredSize(ErrorRenderSize) {
   OPENKNEEBOARD_TraceLoggingScope("NavigationTab::NavigationTab()");
   const auto columns = entries.size() >= 10
     ? std::max(
-      1ui32,
-      static_cast<uint32_t>(
-        (mPreferredSize.mWidth * 1.5f) / mPreferredSize.mHeight))
+        1ui32,
+        static_cast<uint32_t>(
+          (mPreferredSize.mWidth * 1.5f) / mPreferredSize.mHeight))
     : 1;
   const auto entriesPerPage
     = std::min<size_t>(std::max<size_t>(20, 10 * columns), entries.size());

diff --git a/src/app/app-common/Tab/include/OpenKneeboard/NavigationTab.h b/src/app/app-common/Tab/include/OpenKneeboard/NavigationTab.h
@@ -42,11 +42,11 @@ class NavigationTab final : public TabBase,
  public:
   using Entry = NavigationEntry;
 
+  NavigationTab() = delete;
   NavigationTab(
     const audited_ptr<DXResources>&,
     const std::shared_ptr<ITab>& rootTab,
-    const std::vector<NavigationEntry>& entries,
-    const D2D1_SIZE_U& preferredSize);
+    const std::vector<NavigationEntry>& entries);
   ~NavigationTab();
 
   virtual std::string GetGlyph() const override;

diff --git a/src/app/app-common/TabView.cpp b/src/app/app-common/TabView.cpp
@@ -248,11 +248,7 @@ bool TabView::SetTabMode(TabMode mode) {
         mDXR,
         mRootTab,
         std::dynamic_pointer_cast<IPageSourceWithNavigation>(mRootTab)
-          ->GetNavigationEntries(),
-        mRootTab
-          ->GetPreferredSize(
-            mRootTabPage ? (mRootTabPage->mID) : (PageID {nullptr}))
-          .mPixelSize);
+          ->GetNavigationEntries());
       AddEventListener(
         mActiveSubTab->evPageChangeRequestedEvent,
         [this](EventContext ctx, PageID newPage) {