From 3c627c90d8d4180d2cd3172f21773a640fc1a95f Mon Sep 17 00:00:00 2001
From: Barijaona Ramaholimihaso <github.com@barijaona.com>
Date: Tue, 16 Jul 2024 20:20:05 +0300
Subject: [PATCH 1/7] Fix a logic error on tracking imbricated resizes

---
 Vienna/Sources/Main window/ArticleListView.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vienna/Sources/Main window/ArticleListView.m b/Vienna/Sources/Main window/ArticleListView.m
index 4ded9f6838..af10bcdb08 100644
--- a/Vienna/Sources/Main window/ArticleListView.m	
+++ b/Vienna/Sources/Main window/ArticleListView.m	
@@ -1633,11 +1633,11 @@ - (void)splitViewDidResizeSubviews:(NSNotification *)notification {
                 }
             }
             self.articleTextView.translatesAutoresizingMaskIntoConstraints = YES;
+            self.imbricatedSplitViewResizes = NO;
         } else {
             self.articleTextView.translatesAutoresizingMaskIntoConstraints = NO;
             self.textViewWidthConstraint.active = YES;
         }
-        self.imbricatedSplitViewResizes = NO;
     }
 }
 

From b94673e6bcf2db4a02032da079244d089c6a4572 Mon Sep 17 00:00:00 2001
From: Barijaona Ramaholimihaso <github.com@barijaona.com>
Date: Sat, 20 Jul 2024 17:53:49 +0300
Subject: [PATCH 2/7] Relax auto layout constraints inside EnclosureView

As the file image is already specified with a (default) standard size,
we can remove the superfluous size constraints on it.
Set vertical hugging priority to the value suggested by Xcode after
removal of the constraints.

Fixes issue #1618 : changing the height of the article view while
viewing an article without enclosure made the enclosure view to not
appear anymore whenever it should.
---
 .../Base.lproj/MainWindowController.xib       | 47 +++++++++----------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/Vienna/Interfaces/Base.lproj/MainWindowController.xib b/Vienna/Interfaces/Base.lproj/MainWindowController.xib
index 8a6231ab28..e51f8c82bf 100644
--- a/Vienna/Interfaces/Base.lproj/MainWindowController.xib
+++ b/Vienna/Interfaces/Base.lproj/MainWindowController.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22690"/>
         <capability name="Image references" minToolsVersion="12.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -44,7 +44,7 @@
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <clipView key="contentView" drawsBackground="NO" id="QAa-Gc-i1V">
                                     <rect key="frame" x="0.0" y="0.0" width="288" height="603"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" autosaveName="outViewer" rowHeight="24" viewBased="YES" indentationPerLevel="13" outlineTableColumn="xXs-dn-GMc" id="Kk7-ax-B3r" customClass="FolderView">
                                             <rect key="frame" x="0.0" y="0.0" width="288" height="603"/>
@@ -73,7 +73,7 @@
                                                                     <rect key="frame" x="-1" y="0.0" width="20" height="20"/>
                                                                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSActionTemplate" id="a3L-k0-Hh3"/>
                                                                 </imageView>
-                                                                <textField identifier="TextField" horizontalHuggingPriority="249" verticalHuggingPriority="751" horizontalCompressionResistancePriority="250" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JQW-he-OfP">
+                                                                <textField identifier="TextField" focusRingType="none" horizontalHuggingPriority="249" verticalHuggingPriority="751" horizontalCompressionResistancePriority="250" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JQW-he-OfP">
                                                                     <rect key="frame" x="20" y="1" width="180" height="16"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" title="Folder Name" id="RHN-51-qgk">
                                                                         <font key="font" metaFont="system"/>
@@ -174,7 +174,7 @@
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="5Fc-hn-Xm4">
                                 <rect key="frame" x="0.0" y="0.0" width="942" height="22"/>
                                 <subviews>
-                                    <textField verticalHuggingPriority="750" placeholderIntrinsicWidth="100" placeholderIntrinsicHeight="14" preferredMaxLayoutWidth="350" translatesAutoresizingMaskIntoConstraints="NO" id="917">
+                                    <textField focusRingType="none" verticalHuggingPriority="750" placeholderIntrinsicWidth="100" placeholderIntrinsicHeight="14" preferredMaxLayoutWidth="350" translatesAutoresizingMaskIntoConstraints="NO" id="917">
                                         <rect key="frame" x="419" y="4" width="104" height="14"/>
                                         <textFieldCell key="cell" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" alignment="center" id="1367">
                                             <font key="font" metaFont="smallSystem"/>
@@ -356,7 +356,7 @@
                         <popUpButton key="view" verticalHuggingPriority="750" id="eKU-qn-2dn">
                             <rect key="frame" x="0.0" y="14" width="53" height="25"/>
                             <autoresizingMask key="autoresizingMask"/>
-                            <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" imagePosition="only" alignment="left" lineBreakMode="truncatingTail" borderStyle="border" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="NJC-fy-OS8">
+                            <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="FunnelFilterTemplate" imagePosition="only" alignment="left" lineBreakMode="truncatingTail" borderStyle="border" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="NJC-fy-OS8">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="menu"/>
                                 <menu key="menu" id="Mx2-fn-A84">
@@ -499,7 +499,7 @@
                         <popUpButton key="view" verticalHuggingPriority="750" id="gOd-tT-XFQ">
                             <rect key="frame" x="0.0" y="14" width="50" height="25"/>
                             <autoresizingMask key="autoresizingMask"/>
-                            <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" imagePosition="only" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" pullsDown="YES" selectedItem="lu2-BZ-Gxd" id="5CR-Qn-4pP">
+                            <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="StyleTemplate" imagePosition="only" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" pullsDown="YES" selectedItem="lu2-BZ-Gxd" id="5CR-Qn-4pP">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="menu"/>
                                 <menu key="menu" identifier="StylesMenu" id="mit-Vi-iR1">
@@ -559,7 +559,7 @@
                                         <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="1391">
                                             <rect key="frame" x="0.0" y="26" width="701" height="5"/>
                                         </box>
-                                        <searchField toolTip="Filter displayed articles by matching text" wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="250" translatesAutoresizingMaskIntoConstraints="NO" id="1304">
+                                        <searchField toolTip="Filter displayed articles by matching text" wantsLayer="YES" focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="250" translatesAutoresizingMaskIntoConstraints="NO" id="1304">
                                             <rect key="frame" x="8" y="5" width="284" height="19"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" relation="lessThanOrEqual" constant="300" id="LD9-MT-Msv"/>
@@ -585,7 +585,7 @@
                                                 <action selector="hideFilterBar:" target="-1" id="FpS-o7-Ir4"/>
                                             </connections>
                                         </button>
-                                        <textField wantsLayer="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="150" translatesAutoresizingMaskIntoConstraints="NO" id="1305">
+                                        <textField wantsLayer="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="150" translatesAutoresizingMaskIntoConstraints="NO" id="1305">
                                             <rect key="frame" x="385" y="7" width="50" height="14"/>
                                             <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Filter by:" id="1377">
                                                 <font key="font" metaFont="smallSystem"/>
@@ -771,7 +771,7 @@
                                         <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="6nJ-Cc-qUM">
                                             <rect key="frame" x="0.0" y="26" width="701" height="5"/>
                                         </box>
-                                        <searchField toolTip="Filter displayed articles by matching text" wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="250" translatesAutoresizingMaskIntoConstraints="NO" id="a7v-eM-oW1">
+                                        <searchField toolTip="Filter displayed articles by matching text" wantsLayer="YES" focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="250" translatesAutoresizingMaskIntoConstraints="NO" id="a7v-eM-oW1">
                                             <rect key="frame" x="8" y="5" width="284" height="19"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" relation="lessThanOrEqual" constant="300" id="4mp-AL-ns3"/>
@@ -797,7 +797,7 @@
                                                 <action selector="hideFilterBar:" target="-1" id="ky2-GB-9kE"/>
                                             </connections>
                                         </button>
-                                        <textField wantsLayer="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="249" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="150" translatesAutoresizingMaskIntoConstraints="NO" id="FDm-UJ-4O9">
+                                        <textField wantsLayer="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="249" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="150" translatesAutoresizingMaskIntoConstraints="NO" id="FDm-UJ-4O9">
                                             <rect key="frame" x="385" y="7" width="50" height="14"/>
                                             <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Filter by:" id="VXV-Rv-wn5">
                                                 <font key="font" metaFont="smallSystem"/>
@@ -968,27 +968,22 @@
             <point key="canvasLocation" x="1066" y="109"/>
         </customView>
         <customView translatesAutoresizingMaskIntoConstraints="NO" id="1288" customClass="EnclosureView">
-            <rect key="frame" x="0.0" y="0.0" width="444" height="45"/>
+            <rect key="frame" x="0.0" y="0.0" width="462" height="63"/>
             <subviews>
                 <box verticalHuggingPriority="750" alphaValue="0.79577457904815674" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="1392">
-                    <rect key="frame" x="0.0" y="42" width="444" height="5"/>
+                    <rect key="frame" x="0.0" y="60" width="462" height="5"/>
                 </box>
                 <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="250" verticalStackHuggingPriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="PLo-xw-CXM">
-                    <rect key="frame" x="8" y="6" width="428" height="32"/>
+                    <rect key="frame" x="8" y="6" width="446" height="50"/>
                     <subviews>
-                        <imageView id="1289">
-                            <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="32" id="DHh-hp-lMb"/>
-                                <constraint firstAttribute="height" constant="32" id="Nns-hC-vGL"/>
-                            </constraints>
+                        <imageView verticalHuggingPriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="1289">
+                            <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" id="1372"/>
                         </imageView>
                         <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="3" horizontalStackHuggingPriority="250" verticalStackHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RFH-Us-xJO">
-                            <rect key="frame" x="40" y="1" width="300" height="31"/>
+                            <rect key="frame" x="58" y="10" width="300" height="31"/>
                             <subviews>
-                                <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" placeholderIntrinsicWidth="300" placeholderIntrinsicHeight="14" preferredMaxLayoutWidth="9000" translatesAutoresizingMaskIntoConstraints="NO" id="1290">
+                                <textField focusRingType="none" horizontalHuggingPriority="249" verticalHuggingPriority="750" placeholderIntrinsicWidth="300" placeholderIntrinsicHeight="14" preferredMaxLayoutWidth="9000" translatesAutoresizingMaskIntoConstraints="NO" id="1290">
                                     <rect key="frame" x="-2" y="17" width="304" height="14"/>
                                     <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" id="1373">
                                         <font key="font" metaFont="smallSystemBold"/>
@@ -996,7 +991,7 @@
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" placeholderIntrinsicWidth="300" placeholderIntrinsicHeight="14" preferredMaxLayoutWidth="9000" translatesAutoresizingMaskIntoConstraints="NO" id="1292" customClass="DSClickableURLTextField">
+                                <textField focusRingType="none" horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" placeholderIntrinsicWidth="300" placeholderIntrinsicHeight="14" preferredMaxLayoutWidth="9000" translatesAutoresizingMaskIntoConstraints="NO" id="1292" customClass="DSClickableURLTextField">
                                     <rect key="frame" x="-2" y="0.0" width="304" height="14"/>
                                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" id="1375">
                                         <font key="font" metaFont="smallSystem"/>
@@ -1015,7 +1010,7 @@
                             </customSpacing>
                         </stackView>
                         <button horizontalHuggingPriority="251" verticalHuggingPriority="750" placeholderIntrinsicWidth="80" placeholderIntrinsicHeight="21" translatesAutoresizingMaskIntoConstraints="NO" id="1291">
-                            <rect key="frame" x="341" y="-1" width="94" height="33"/>
+                            <rect key="frame" x="359" y="8" width="94" height="33"/>
                             <buttonCell key="cell" type="push" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="1374">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
@@ -1155,7 +1150,7 @@
         <image name="GetInfoTemplate" width="28" height="28"/>
         <image name="MarkReadTemplate" width="19" height="14"/>
         <image name="NSActionTemplate" width="20" height="20"/>
-        <image name="NSShareTemplate" width="19" height="22"/>
+        <image name="NSShareTemplate" width="19" height="23"/>
         <image name="NSStopProgressFreestandingTemplate" width="20" height="20"/>
         <image name="NewFeedTemplate" width="38" height="24"/>
         <image name="NextFolderTemplate" width="19" height="12"/>

From 0de91dcd15e758bee7b89da3e6b83f43a558f32a Mon Sep 17 00:00:00 2001
From: Barijaona Ramaholimihaso <github.com@barijaona.com>
Date: Sun, 21 Jul 2024 09:42:30 +0300
Subject: [PATCH 3/7] Normalize position of tip about hovered link's URL

Position the OverlayStatusBar at bottom of Unified display view
---
 Vienna/Sources/Main window/UnifiedDisplayView.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vienna/Sources/Main window/UnifiedDisplayView.m b/Vienna/Sources/Main window/UnifiedDisplayView.m
index 514ac3e5bf..10ed37c272 100644
--- a/Vienna/Sources/Main window/UnifiedDisplayView.m	
+++ b/Vienna/Sources/Main window/UnifiedDisplayView.m	
@@ -776,7 +776,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath
         BOOL isStatusBarShown = [Preferences standardPreferences].showStatusBar;
         if (isStatusBarShown && !self.statusBar) {
             self.statusBar = [OverlayStatusBar new];
-            [articleList.enclosingScrollView addSubview:self.statusBar];
+            [self addSubview:self.statusBar];
         } else if (!isStatusBarShown && self.statusBar) {
             [self.statusBar removeFromSuperview];
             self.statusBar = nil;

From 91222467ebedd94a0ed733072d4d2962448f966c Mon Sep 17 00:00:00 2001
From: Barijaona Ramaholimihaso <github.com@barijaona.com>
Date: Sun, 28 Jul 2024 11:02:55 +0300
Subject: [PATCH 4/7] Apply constraints to full HTML pages only

- As the problem of instable widths (for article list or article view)
are reported only with feeds having "Use Web Page for Articles" set,
reverse approach of commit c491522 and enforce a constraint while the
web page used as article view is loading
- Simplify the NSSplitView delegates as we don't need anymore to track
imbricated calls to delegates as we had to do when dealing with legacy
WebViews
- use the same delegate (ArticleListView) for the main NSSplitView and
ArticleListView's splitView2

Solves wild resizing of window with "Use Web Page for Articles" mode on
horizontal layout with feeds like https://feeds.feedburner.com/LegalInsurrection
(reported in issue #1722) while preserving functionality of the main
split view.
---
 .../Base.lproj/MainWindowController.xib       | 10 +-
 Vienna/Sources/Main window/ArticleListView.m  | 96 +++++++++----------
 2 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/Vienna/Interfaces/Base.lproj/MainWindowController.xib b/Vienna/Interfaces/Base.lproj/MainWindowController.xib
index e51f8c82bf..79798a7427 100644
--- a/Vienna/Interfaces/Base.lproj/MainWindowController.xib
+++ b/Vienna/Interfaces/Base.lproj/MainWindowController.xib
@@ -44,7 +44,7 @@
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <clipView key="contentView" drawsBackground="NO" id="QAa-Gc-i1V">
                                     <rect key="frame" x="0.0" y="0.0" width="288" height="603"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" autosaveName="outViewer" rowHeight="24" viewBased="YES" indentationPerLevel="13" outlineTableColumn="xXs-dn-GMc" id="Kk7-ax-B3r" customClass="FolderView">
                                             <rect key="frame" x="0.0" y="0.0" width="288" height="603"/>
@@ -167,6 +167,9 @@
                             <real value="251"/>
                             <real value="250"/>
                         </holdingPriorities>
+                        <connections>
+                            <outlet property="delegate" destination="971" id="SHb-bg-Cde"/>
+                        </connections>
                     </splitView>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="659-iz-w4S" customClass="DisclosureView">
                         <rect key="frame" x="0.0" y="0.0" width="942" height="22"/>
@@ -356,7 +359,7 @@
                         <popUpButton key="view" verticalHuggingPriority="750" id="eKU-qn-2dn">
                             <rect key="frame" x="0.0" y="14" width="53" height="25"/>
                             <autoresizingMask key="autoresizingMask"/>
-                            <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="FunnelFilterTemplate" imagePosition="only" alignment="left" lineBreakMode="truncatingTail" borderStyle="border" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="NJC-fy-OS8">
+                            <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" imagePosition="only" alignment="left" lineBreakMode="truncatingTail" borderStyle="border" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="NJC-fy-OS8">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="menu"/>
                                 <menu key="menu" id="Mx2-fn-A84">
@@ -734,6 +737,9 @@
                                 <real value="250"/>
                                 <real value="250"/>
                             </holdingPriorities>
+                            <connections>
+                                <outlet property="delegate" destination="971" id="yYg-ym-fZU"/>
+                            </connections>
                         </splitView>
                     </subviews>
                     <constraints>
diff --git a/Vienna/Sources/Main window/ArticleListView.m b/Vienna/Sources/Main window/ArticleListView.m
index af10bcdb08..a7425b6f06 100644
--- a/Vienna/Sources/Main window/ArticleListView.m	
+++ b/Vienna/Sources/Main window/ArticleListView.m	
@@ -61,7 +61,6 @@ -(void)setOrientation:(NSInteger)newLayout;
 
 @property NSView *articleTextView;
 @property (strong) NSLayoutConstraint *textViewWidthConstraint;
-@property (nonatomic) BOOL imbricatedSplitViewResizes; // used to avoid warnings about missing invalidation for a view's changing state
 @property (nonatomic) NSLayoutManager *layoutManager;
 
 // MARK: ArticleView delegate
@@ -109,7 +108,6 @@ -(instancetype)initWithFrame:(NSRect)frame
 		markReadTimer = nil;
 		_currentPageFullHTML = NO;
 		isLoadingHTMLArticle = NO;
-		self.imbricatedSplitViewResizes = NO;
         _layoutManager = [NSLayoutManager new];
     }
     return self;
@@ -144,6 +142,20 @@ -(void)initialiseArticleView
 
     [self.contentStackView addView:self.articleTextView inGravity:NSStackViewGravityTop];
 
+    // With "Use Web Page for Articles" set, we need to manage article view's width
+    //  so that it does not grow or shrink randomly on certain sites.
+    // The best solution I found is programmatically setting a constraint with a
+    // "constant" value.
+    // This did not work for me: self.textViewWidthConstraint =
+    //     [NSLayoutConstraint constraintWithItem:articleTextView attribute:NSLayoutAttributeWidth
+    //         relatedBy:NSLayoutRelationEqual toItem:self.contentStackView attribute:NSLayoutAttributeWidth
+    //         multiplier:1.f constant:0.f];
+    self.textViewWidthConstraint = [NSLayoutConstraint constraintWithItem:self.articleTextView
+        attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual
+        toItem:nil attribute:NSLayoutAttributeNotAnAttribute
+        multiplier:0.f constant:self.contentStackView.frame.size.width];
+    self.articleTextView.translatesAutoresizingMaskIntoConstraints = NO;
+    [self.contentStackView addConstraint:self.textViewWidthConstraint];
 
 	Preferences * prefs = [Preferences standardPreferences];
 
@@ -171,33 +183,12 @@ -(void)initialiseArticleView
 	// Set the reading pane orientation
 	[self setOrientation:prefs.layout];
 	
-    // With vertical layout and "Use Web Page for Articles" set, we need to
-    // manage article view's width so that it does not grow or shrink randomly
-    // on certain sites.
-    // The best solution I found is programmatically setting a constraint with a
-    // "constant" value.
-    // This did not work for me: self.textViewWidthConstraint =
-    //     [NSLayoutConstraint constraintWithItem:articleTextView attribute:NSLayoutAttributeWidth
-    //         relatedBy:NSLayoutRelationEqual toItem:self.contentStackView attribute:NSLayoutAttributeWidth
-    //         multiplier:1.f constant:0.f];
-    self.textViewWidthConstraint =
-        [NSLayoutConstraint constraintWithItem:self.articleTextView attribute:NSLayoutAttributeWidth
-            relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute
-            multiplier:0.f constant:self.contentStackView.frame.size.width];
-    self.textViewWidthConstraint.priority = NSLayoutPriorityRequired;
-    self.articleTextView.translatesAutoresizingMaskIntoConstraints = NO;
-    // for some reason, this constraint is necessary for new browser with vertical layout, but it is counterproductive with other configurations
-    self.textViewWidthConstraint.active = splitView2.vertical;
-
 	// Initialise the article list view
 	[self initTableView];
 
 	// Make sure we skip the column filter button in the Tab order
     articleList.nextKeyView = self.articleTextView;
 
-    // Allow us to control the behavior of the NSSplitView
-    splitView2.delegate = self;
-
 	// Done initialising
 	isAppInitialising = NO;
 
@@ -814,9 +805,16 @@ -(void)setOrientation:(NSInteger)newLayout
 	tableLayout = newLayout;
 	splitView2.autosaveName = nil;
 	splitView2.vertical = (newLayout == VNALayoutCondensed);
-	splitView2.dividerStyle = (splitView2.vertical ? NSSplitViewDividerStyleThin : NSSplitViewDividerStylePaneSplitter);
-	splitView2.autosaveName = (newLayout == VNALayoutCondensed ? @"Vienna3SplitView2CondensedLayout" : @"Vienna3SplitView2ReportLayout");
-	self.textViewWidthConstraint.active = splitView2.vertical;
+	if (splitView2.vertical) {
+		splitView2.dividerStyle = NSSplitViewDividerStyleThin;
+		splitView2.autosaveName = @"Vienna3SplitView2CondensedLayout";
+	} else {
+		splitView2.dividerStyle = NSSplitViewDividerStylePaneSplitter;
+		splitView2.autosaveName = @"Vienna3SplitView2ReportLayout";
+	}
+    self.textViewWidthConstraint.constant = self.contentStackView.frame.size.width;
+	self.textViewWidthConstraint.priority = NSLayoutPriorityRequired;
+	self.textViewWidthConstraint.active = self.currentPageFullHTML;
 	[splitView2 display];
 	isChangingOrientation = NO;
 }
@@ -1075,7 +1073,8 @@ -(void)refreshArticlePane
 	if (msgArray.count == 0) {
 		// We are not a FULL HTML page.
 		self.currentPageFullHTML = NO;
-		
+        self.textViewWidthConstraint.active = YES;
+
 		// Clear out the page.
 		[articleText setArticles:@[]];
 	} else {
@@ -1091,6 +1090,9 @@ -(void)refreshArticlePane
 			// Remember we have a full HTML page so we can setup the context menus
 			// appropriately.
 			self.currentPageFullHTML = YES;
+
+            // enforce our constraint
+            self.textViewWidthConstraint.active = YES;
 			
 			// Now set the article to the URL in the RSS feed's article. NOTE: We use
 			// performSelector:withObject:afterDelay: here so that this link load gets
@@ -1106,6 +1108,8 @@ -(void)refreshArticlePane
 			// appropriately.
 			isLoadingHTMLArticle = NO;
 			
+			self.textViewWidthConstraint.active = NO;
+
 			// Set the article to the HTML from the RSS feed.
 			[articleText setArticles:msgArray];
 		}
@@ -1596,48 +1600,38 @@ - (void)endMainFrameLoad
     }
 }
 
-// MARK : splitView2 delegate
+// MARK: splitView2 & main window's splitView delegate
 
 - (void)splitViewWillResizeSubviews:(NSNotification *)notification {
     NSDictionary * info = notification.userInfo;
     NSInteger userResizeKey = ((NSNumber *)info[@"NSSplitViewUserResizeKey"]).integerValue;
     if (userResizeKey == 1) { // user initiated resize
         self.textViewWidthConstraint.active = NO;
-        if (self.imbricatedSplitViewResizes) {
-            // remove any other constraint affecting articleTextView's horizontal axis,
-            // and let autoresizing do the job
-            for (NSLayoutConstraint *c in [self.articleTextView constraintsAffectingLayoutForOrientation:NSLayoutConstraintOrientationHorizontal]) {
-                if ((c.firstItem == self.articleTextView || c.secondItem == self.articleTextView) && (c != self.textViewWidthConstraint)) {
-                    [self.articleTextView removeConstraint:c];
-                }
+        // remove any other constraint affecting articleTextView's horizontal axis,
+        // and let autoresizing do the job
+        for (NSLayoutConstraint *c in [self.articleTextView constraintsAffectingLayoutForOrientation:NSLayoutConstraintOrientationHorizontal]) {
+            if ((c.firstItem == self.articleTextView || c.secondItem == self.articleTextView) && (c != self.textViewWidthConstraint)) {
+                [self.articleTextView removeConstraint:c];
             }
-            self.articleTextView.translatesAutoresizingMaskIntoConstraints = YES;
-        } else {
-            self.imbricatedSplitViewResizes = YES;
         }
+        self.articleTextView.translatesAutoresizingMaskIntoConstraints = YES;
     }
 }
 
 - (void)splitViewDidResizeSubviews:(NSNotification *)notification {
-    // update and reactivate constraint
+    // update constraint
     self.textViewWidthConstraint.constant = self.contentStackView.frame.size.width;
     NSDictionary * info = notification.userInfo;
     NSInteger userResizeKey = ((NSNumber *)info[@"NSSplitViewUserResizeKey"]).integerValue;
     if (userResizeKey == 1) {
-        if (self.imbricatedSplitViewResizes) {
-            // remove again any other constraint affecting articleTextView's horizontal axis,
-            // and let autoresizing do the job
-            for (NSLayoutConstraint *c in [self.articleTextView constraintsAffectingLayoutForOrientation:NSLayoutConstraintOrientationHorizontal]) {
-                if ((c.firstItem == self.articleTextView || c.secondItem == self.articleTextView) && (c != self.textViewWidthConstraint)) {
-                    [self.articleTextView removeConstraint:c];
-                }
+        // remove again any other constraint affecting articleTextView's horizontal axis,
+        // and let autoresizing do the job
+        for (NSLayoutConstraint *c in [self.articleTextView constraintsAffectingLayoutForOrientation:NSLayoutConstraintOrientationHorizontal]) {
+            if ((c.firstItem == self.articleTextView || c.secondItem == self.articleTextView) && (c != self.textViewWidthConstraint)) {
+                [self.articleTextView removeConstraint:c];
             }
-            self.articleTextView.translatesAutoresizingMaskIntoConstraints = YES;
-            self.imbricatedSplitViewResizes = NO;
-        } else {
-            self.articleTextView.translatesAutoresizingMaskIntoConstraints = NO;
-            self.textViewWidthConstraint.active = YES;
         }
+        self.articleTextView.translatesAutoresizingMaskIntoConstraints = YES;
     }
 }
 

From 9dd009495e91397feda5c486cde8e9b4d0ddad04 Mon Sep 17 00:00:00 2001
From: Barijaona Ramaholimihaso <github.com@barijaona.com>
Date: Sun, 28 Jul 2024 17:07:17 +0300
Subject: [PATCH 5/7] Prevent disruptions related to unified layout

---
 Vienna/Sources/Main window/ArticleListView.m | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Vienna/Sources/Main window/ArticleListView.m b/Vienna/Sources/Main window/ArticleListView.m
index a7425b6f06..978cdb0044 100644
--- a/Vienna/Sources/Main window/ArticleListView.m	
+++ b/Vienna/Sources/Main window/ArticleListView.m	
@@ -35,6 +35,7 @@
 #import "Database.h"
 #import "Vienna-Swift.h"
 #import "GeneratedAssetSymbols.h"
+#import "AppController.h"
 
 // Shared defaults key
 NSString * const MAPref_ShowEnclosureBar = @"ShowEnclosureBar";
@@ -1603,6 +1604,9 @@ - (void)endMainFrameLoad
 // MARK: splitView2 & main window's splitView delegate
 
 - (void)splitViewWillResizeSubviews:(NSNotification *)notification {
+    if (self != APPCONTROLLER.articleController.mainArticleView) {
+        return;
+    }
     NSDictionary * info = notification.userInfo;
     NSInteger userResizeKey = ((NSNumber *)info[@"NSSplitViewUserResizeKey"]).integerValue;
     if (userResizeKey == 1) { // user initiated resize
@@ -1619,6 +1623,9 @@ - (void)splitViewWillResizeSubviews:(NSNotification *)notification {
 }
 
 - (void)splitViewDidResizeSubviews:(NSNotification *)notification {
+    if (self != APPCONTROLLER.articleController.mainArticleView) {
+        return;
+    }
     // update constraint
     self.textViewWidthConstraint.constant = self.contentStackView.frame.size.width;
     NSDictionary * info = notification.userInfo;

From 6fd423bab37dbf73f765e85a919542f643a175af Mon Sep 17 00:00:00 2001
From: Barijaona Ramaholimihaso <github.com@barijaona.com>
Date: Mon, 29 Jul 2024 22:42:47 +0300
Subject: [PATCH 6/7] Generalize the width constraint & adapt to layout

Some wild resizes could still appear, with the following sequence:
- see https://feeds.feedburner.com/LegalInsurrection with the "Use Web
Page for Articles" setting, switch back and forth between vertical and
horizontal layout
- switch to another folder displayed using a built-in style, switch back
and forth between vertical and horizontal layout
---
 Vienna/Sources/Main window/ArticleListView.m | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/Vienna/Sources/Main window/ArticleListView.m b/Vienna/Sources/Main window/ArticleListView.m
index 978cdb0044..79e630cbe4 100644
--- a/Vienna/Sources/Main window/ArticleListView.m	
+++ b/Vienna/Sources/Main window/ArticleListView.m	
@@ -809,13 +809,14 @@ -(void)setOrientation:(NSInteger)newLayout
 	if (splitView2.vertical) {
 		splitView2.dividerStyle = NSSplitViewDividerStyleThin;
 		splitView2.autosaveName = @"Vienna3SplitView2CondensedLayout";
+		self.textViewWidthConstraint.constant = self.contentStackView.frame.size.width;
 	} else {
 		splitView2.dividerStyle = NSSplitViewDividerStylePaneSplitter;
 		splitView2.autosaveName = @"Vienna3SplitView2ReportLayout";
+		self.textViewWidthConstraint.constant = splitView2.frame.size.width;
 	}
-    self.textViewWidthConstraint.constant = self.contentStackView.frame.size.width;
 	self.textViewWidthConstraint.priority = NSLayoutPriorityRequired;
-	self.textViewWidthConstraint.active = self.currentPageFullHTML;
+	self.textViewWidthConstraint.active = YES;
 	[splitView2 display];
 	isChangingOrientation = NO;
 }
@@ -1071,10 +1072,12 @@ -(void)refreshArticlePane
 {
 	NSArray * msgArray = self.markedArticleRange;
 	
+	// enforce our constraint
+	self.textViewWidthConstraint.active = YES;
+
 	if (msgArray.count == 0) {
 		// We are not a FULL HTML page.
 		self.currentPageFullHTML = NO;
-        self.textViewWidthConstraint.active = YES;
 
 		// Clear out the page.
 		[articleText setArticles:@[]];
@@ -1092,9 +1095,6 @@ -(void)refreshArticlePane
 			// appropriately.
 			self.currentPageFullHTML = YES;
 
-            // enforce our constraint
-            self.textViewWidthConstraint.active = YES;
-			
 			// Now set the article to the URL in the RSS feed's article. NOTE: We use
 			// performSelector:withObject:afterDelay: here so that this link load gets
 			// queued up into the event loop, otherwise the WebView class won't draw the
@@ -1108,8 +1108,6 @@ -(void)refreshArticlePane
 			// Remember we're NOT loading from HTML so the status message is set
 			// appropriately.
 			isLoadingHTMLArticle = NO;
-			
-			self.textViewWidthConstraint.active = NO;
 
 			// Set the article to the HTML from the RSS feed.
 			[articleText setArticles:msgArray];

From b8bb6f90a8fc7188a8fa39f5f7dd26202facf5c9 Mon Sep 17 00:00:00 2001
From: Barijaona Ramaholimihaso <github.com@barijaona.com>
Date: Sat, 10 Aug 2024 20:12:14 +0300
Subject: [PATCH 7/7] Fix enclosure show/hide issues after resize

After resizing of one of the split views, showing enclosure view while
it was hidden, or hiding enclosure view while it was visible led to
auto-layout issues.
---
 Vienna/Sources/Main window/ArticleListView.m | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Vienna/Sources/Main window/ArticleListView.m b/Vienna/Sources/Main window/ArticleListView.m
index 79e630cbe4..7ee376f0a2 100644
--- a/Vienna/Sources/Main window/ArticleListView.m	
+++ b/Vienna/Sources/Main window/ArticleListView.m	
@@ -887,6 +887,7 @@ - (void)showEnclosureView {
     }
 
     if (![self.contentStackView.views containsObject:self.enclosureView]) {
+        self.articleTextView.translatesAutoresizingMaskIntoConstraints = NO;
         [self.contentStackView addView:self.enclosureView
                             inGravity:NSStackViewGravityTop];
     }
@@ -895,6 +896,7 @@ - (void)showEnclosureView {
 // Hide the enclosure view if it is present.
 - (void)hideEnclosureView {
     if ([self.contentStackView.views containsObject:self.enclosureView]) {
+        self.articleTextView.translatesAutoresizingMaskIntoConstraints = NO;
         [self.contentStackView removeView:self.enclosureView];
     }
 }