Skip to content

Commit

Permalink
Merge pull request #1292 from dnicolson/fix-window-sizing
Browse files Browse the repository at this point in the history 
Fix window constraints
  • Loading branch information
@glouel
glouel authored Apr 1, 2023
2 parents 56b981a + 5c66b7b commit d20cefc
Show file tree
Hide file tree
Showing 13 changed files with 243 additions and 230 deletions.
43 changes: 22 additions & 21 deletions Resources/MainUI/Infos panels/CreditsViewController.xib
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand All @@ -13,21 +13,20 @@
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView id="Hz6-mo-xeY">
<rect key="frame" x="0.0" y="0.0" width="739" height="486"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="Hz6-mo-xeY">
<rect key="frame" x="0.0" y="0.0" width="811" height="530"/>
<subviews>
<scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JTK-WM-mgr">
<rect key="frame" x="0.0" y="0.0" width="739" height="486"/>
<rect key="frame" x="0.0" y="0.0" width="811" height="530"/>
<clipView key="contentView" id="Sz1-o4-35Y">
<rect key="frame" x="1" y="1" width="737" height="484"/>
<rect key="frame" x="1" y="1" width="794" height="513"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="Y1q-aR-nvJ">
<rect key="frame" x="0.0" y="-8" width="737" height="492"/>
<rect key="frame" x="0.0" y="-17" width="794" height="530"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="ReU-xc-cMA">
<rect key="frame" x="198" y="421" width="504" height="51"/>
<rect key="frame" x="198" y="459" width="504" height="51"/>
<constraints>
<constraint firstAttribute="width" constant="500" id="GtJ-bZ-C8o"/>
</constraints>
Expand All @@ -41,7 +40,7 @@ Since version 1.4, Aerial is developed and maintained by Guillaume Louel.</strin
</textFieldCell>
</textField>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Gv6-y0-c1S">
<rect key="frame" x="194" y="-3" width="135" height="40"/>
<rect key="frame" x="194" y="35" width="135" height="40"/>
<buttonCell key="cell" type="push" title="Contact us here" bezelStyle="rounded" alignment="center" controlSize="large" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="a1o-SL-FaN">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system" size="14"/>
Expand All @@ -51,7 +50,7 @@ Since version 1.4, Aerial is developed and maintained by Guillaume Louel.</strin
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hEl-hg-Xq5">
<rect key="frame" x="194" y="367" width="142" height="40"/>
<rect key="frame" x="194" y="405" width="142" height="40"/>
<buttonCell key="cell" type="push" title="Visit our Website" bezelStyle="rounded" alignment="center" controlSize="large" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="8Qc-M5-TLV">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system" size="14"/>
Expand All @@ -61,10 +60,10 @@ Since version 1.4, Aerial is developed and maintained by Guillaume Louel.</strin
</connections>
</button>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="wpw-1v-dic">
<rect key="frame" x="198" y="47" width="311" height="306"/>
<rect key="frame" x="198" y="85" width="311" height="306"/>
<textFieldCell key="cell" selectable="YES" id="sP2-o5-2MT">
<font key="font" metaFont="system" size="14"/>
<mutableString key="title">Translations contributed by:
<string key="title">Translations contributed by:
- Arabic by Kachi Kulu
- Dutch by Sebastiaan Speck
- English by Sean M Smith
Expand All @@ -81,13 +80,13 @@ Since version 1.4, Aerial is developed and maintained by Guillaume Louel.</strin
- Spanish by Aitor García Rey
- Swedish by Samuel Holm

Want to help with translations?</mutableString>
Want to help with translations?</string>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2zM-0X-9R0">
<rect key="frame" x="363" y="-3" width="133" height="40"/>
<rect key="frame" x="363" y="35" width="133" height="40"/>
<buttonCell key="cell" type="push" title="Hop on Discord" bezelStyle="rounded" alignment="center" controlSize="large" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="KmS-rN-Kxf">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system" size="14"/>
Expand All @@ -97,15 +96,15 @@ Want to help with translations?</mutableString>
</connections>
</button>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ohW-uj-N2U">
<rect key="frame" x="337" y="10" width="18" height="17"/>
<rect key="frame" x="337" y="48" width="18" height="17"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="or" id="PRg-cf-Ee8">
<font key="font" metaFont="system" size="14"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="J7J-2w-Ik9">
<rect key="frame" x="340" y="367" width="220" height="40"/>
<rect key="frame" x="340" y="405" width="220" height="40"/>
<buttonCell key="cell" type="push" title="Visit the GitHub Project Page" bezelStyle="rounded" alignment="center" controlSize="large" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="HmR-fK-HDO">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system" size="14"/>
Expand All @@ -127,7 +126,7 @@ Want to help with translations?</mutableString>
<constraint firstItem="2zM-0X-9R0" firstAttribute="firstBaseline" secondItem="Gv6-y0-c1S" secondAttribute="firstBaseline" id="UxQ-eg-aLW"/>
<constraint firstItem="Gv6-y0-c1S" firstAttribute="leading" secondItem="wpw-1v-dic" secondAttribute="leading" id="eZZ-wK-odk"/>
<constraint firstItem="J7J-2w-Ik9" firstAttribute="firstBaseline" secondItem="hEl-hg-Xq5" secondAttribute="firstBaseline" id="hIM-b9-aY1"/>
<constraint firstAttribute="height" constant="492" id="j93-s5-71V"/>
<constraint firstAttribute="height" constant="530" id="j93-s5-71V"/>
<constraint firstItem="J7J-2w-Ik9" firstAttribute="leading" secondItem="hEl-hg-Xq5" secondAttribute="trailing" constant="16" id="m9w-Gb-5AR"/>
<constraint firstItem="Gv6-y0-c1S" firstAttribute="top" secondItem="wpw-1v-dic" secondAttribute="bottom" constant="16" id="nFt-Zo-mMV"/>
<constraint firstItem="hEl-hg-Xq5" firstAttribute="top" secondItem="ReU-xc-cMA" secondAttribute="bottom" constant="20" id="yh4-bS-5yh"/>
Expand All @@ -141,20 +140,22 @@ Want to help with translations?</mutableString>
</constraints>
</clipView>
<scroller key="horizontalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="uxu-lf-jvj">
<rect key="frame" x="1" y="469" width="737" height="16"/>
<rect key="frame" x="1" y="514" width="794" height="15"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="0.75" horizontal="NO" id="34h-Lz-aVs">
<rect key="frame" x="722" y="1" width="16" height="484"/>
<scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="34h-Lz-aVs">
<rect key="frame" x="795" y="1" width="15" height="513"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
</scrollView>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="JTK-WM-mgr" secondAttribute="bottom" id="4Uo-Sh-hPI"/>
<constraint firstItem="JTK-WM-mgr" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="CfZ-E8-gg4"/>
<constraint firstAttribute="width" constant="811" id="SVE-Ie-5qf"/>
<constraint firstItem="JTK-WM-mgr" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" id="j0S-Qf-RMg"/>
<constraint firstAttribute="trailing" secondItem="JTK-WM-mgr" secondAttribute="trailing" id="jCc-Px-UYb"/>
<constraint firstAttribute="height" constant="530" id="xcR-Bc-mK8"/>
</constraints>
<point key="canvasLocation" x="29.5" y="150"/>
</customView>
Expand Down
Loading

0 comments on commit d20cefc

Please sign in to comment.