nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 07:02:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

reset icon working again

Browse Source
This commit is contained in:
michael starke
2017-09-07 23:59:57 +02:00
parent 348da78e23
commit b9e8981619
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MacPass/Base.lproj/IconSelection.xib
View File

@@ -18,7 +18,7 @@
<rect key="frame" x="0.0" y="0.0" width="400" height="340"/> <rect key="frame" x="0.0" y="0.0" width="400" height="340"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews> <subviews>
<scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="57" customClass="HNHUIScrollView"> <scrollView wantsLayer="YES" focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="57" customClass="HNHUIScrollView">
<rect key="frame" x="10" y="50" width="380" height="240"/> <rect key="frame" x="10" y="50" width="380" height="240"/>
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="Gwf-zs-lPT"> <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="Gwf-zs-lPT">
<rect key="frame" x="0.0" y="0.0" width="380" height="240"/> <rect key="frame" x="0.0" y="0.0" width="380" height="240"/>
@@ -38,7 +38,7 @@
<rect key="frame" x="1" y="144" width="233" height="15"/> <rect key="frame" x="1" y="144" width="233" height="15"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
</scroller> </scroller>
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="60"> <scroller key="verticalScroller" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="60">
<rect key="frame" x="364" y="0.0" width="16" height="240"/> <rect key="frame" x="364" y="0.0" width="16" height="240"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
</scroller> </scroller>
@@ -54,8 +54,8 @@
</connections> </connections>
</button> </button>
<segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QWR-lI-xJr"> <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QWR-lI-xJr">
<rect key="frame" x="132" y="296" width="136" height="25"/> <rect key="frame" x="134" y="296" width="132" height="25"/>
<segmentedCell key="cell" borderStyle="border" alignment="left" style="texturedRounded" trackingMode="selectOne" id="0BD-eH-GR9"> <segmentedCell key="cell" borderStyle="border" alignment="left" style="texturedSquare" trackingMode="selectOne" id="0BD-eH-GR9">
<font key="font" metaFont="system"/> <font key="font" metaFont="system"/>
<segments> <segments>
<segment label="Built in"/> <segment label="Built in"/>

1
MacPass/MPIconSelectViewController.m
View File

@@ -81,6 +81,7 @@ typedef NS_ENUM(NSUInteger, MPIconeSelectionType) {
KPKNode *node = self.representedObject; KPKNode *node = self.representedObject;
[self.observer willChangeModelProperty]; [self.observer willChangeModelProperty];
node.iconId = [node.class defaultIcon]; node.iconId = [node.class defaultIcon];
node.iconUUID = nil;
[self.observer didChangeModelProperty]; [self.observer didChangeModelProperty];
[self.view.window performClose:sender]; [self.view.window performClose:sender];
} }