Skip to content
This repository was archived by the owner on Oct 12, 2018. It is now read-only.

Commit f17021b

Browse files
CozmonatCozmonat
committed
Minor UI tweaks
1 parent d510b1a commit f17021b

13 files changed

+346
-79
lines changed

‎HWMonitor.xcodeproj/project.pbxproj

+20-6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
7E0200B118035D3700520CF7 /* RFOverlayScroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E0200AE18035D3700520CF7 /* RFOverlayScroller.m */; };
11+
7E0200B218035D3700520CF7 /* RFOverlayScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E0200B018035D3700520CF7 /* RFOverlayScrollView.m */; };
1012
7E0648F016DF3B7D00ACB851 /* LaunchAtLoginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E0648EE16DF3B7D00ACB851 /* LaunchAtLoginController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
1113
7E0648F116DF3B7D00ACB851 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 7E0648EF16DF3B7D00ACB851 /* README.md */; };
1214
7E10343616EFAE490089DE7B /* GenericBatteryDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E10343516EFAE490089DE7B /* GenericBatteryDevice.m */; };
@@ -15,7 +17,6 @@
1517
7E16893616EA106D00BBF6FC /* ArrowlessScroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E16893516EA106D00BBF6FC /* ArrowlessScroller.m */; };
1618
7E16FD87170648BF00FB253E /* HWMonitorProfiles.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E16FD86170648BF00FB253E /* HWMonitorProfiles.m */; };
1719
7E16FD8A1706BB3000FB253E /* TransparentSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E16FD891706BB3000FB253E /* TransparentSplitView.m */; };
18-
7E170740170569700019173D /* OverlapingScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E17073F170569700019173D /* OverlapingScrollView.m */; };
1920
7E17953616EE705B00145082 /* BatteryCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E17953516EE705B00145082 /* BatteryCell.m */; };
2021
7E19000117005652008F40F1 /* SensorsTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E19000017005652008F40F1 /* SensorsTableView.m */; };
2122
7E19000717006727008F40F1 /* PrefsSensorCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E19000617006727008F40F1 /* PrefsSensorCell.m */; };
@@ -132,6 +133,10 @@
132133

133134
/* Begin PBXFileReference section */
134135
7E00C2481708B827001570E4 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
136+
7E0200AD18035D3700520CF7 /* RFOverlayScroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RFOverlayScroller.h; sourceTree = "<group>"; };
137+
7E0200AE18035D3700520CF7 /* RFOverlayScroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RFOverlayScroller.m; sourceTree = "<group>"; };
138+
7E0200AF18035D3700520CF7 /* RFOverlayScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RFOverlayScrollView.h; sourceTree = "<group>"; };
139+
7E0200B018035D3700520CF7 /* RFOverlayScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RFOverlayScrollView.m; sourceTree = "<group>"; };
135140
7E0648ED16DF3B7D00ACB851 /* LaunchAtLoginController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LaunchAtLoginController.h; sourceTree = "<group>"; };
136141
7E0648EE16DF3B7D00ACB851 /* LaunchAtLoginController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LaunchAtLoginController.m; sourceTree = "<group>"; };
137142
7E0648EF16DF3B7D00ACB851 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; };
@@ -146,8 +151,6 @@
146151
7E16FD86170648BF00FB253E /* HWMonitorProfiles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HWMonitorProfiles.m; sourceTree = "<group>"; };
147152
7E16FD881706BB3000FB253E /* TransparentSplitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransparentSplitView.h; sourceTree = "<group>"; };
148153
7E16FD891706BB3000FB253E /* TransparentSplitView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TransparentSplitView.m; sourceTree = "<group>"; };
149-
7E17073E1705696F0019173D /* OverlapingScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OverlapingScrollView.h; sourceTree = "<group>"; };
150-
7E17073F170569700019173D /* OverlapingScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OverlapingScrollView.m; sourceTree = "<group>"; };
151154
7E17953416EE705B00145082 /* BatteryCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BatteryCell.h; sourceTree = "<group>"; };
152155
7E17953516EE705B00145082 /* BatteryCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BatteryCell.m; sourceTree = "<group>"; };
153156
7E19000017005652008F40F1 /* SensorsTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SensorsTableView.m; sourceTree = "<group>"; };
@@ -307,6 +310,17 @@
307310
/* End PBXFrameworksBuildPhase section */
308311

309312
/* Begin PBXGroup section */
313+
7E0200AC18035D3700520CF7 /* RFOverlayScrollView */ = {
314+
isa = PBXGroup;
315+
children = (
316+
7E0200AD18035D3700520CF7 /* RFOverlayScroller.h */,
317+
7E0200AE18035D3700520CF7 /* RFOverlayScroller.m */,
318+
7E0200AF18035D3700520CF7 /* RFOverlayScrollView.h */,
319+
7E0200B018035D3700520CF7 /* RFOverlayScrollView.m */,
320+
);
321+
path = RFOverlayScrollView;
322+
sourceTree = "<group>";
323+
};
310324
7E0648F216DF3B8300ACB851 /* LaunchAtLoginController */ = {
311325
isa = PBXGroup;
312326
children = (
@@ -538,6 +552,7 @@
538552
isa = PBXGroup;
539553
children = (
540554
7E39415716DBEA13005A685D /* Cells */,
555+
7E0200AC18035D3700520CF7 /* RFOverlayScrollView */,
541556
7E9A17D117E45ACA003DB018 /* NSString+Size.h */,
542557
7E9A17D217E45ACA003DB018 /* NSString+Size.m */,
543558
7E9A17CE17E45938003DB018 /* NSPopover+Message.h */,
@@ -550,8 +565,6 @@
550565
7E7B9B3E1786A732003ACB61 /* OBMenuBarWindow.m */,
551566
7E16893416EA106D00BBF6FC /* ArrowlessScroller.h */,
552567
7E16893516EA106D00BBF6FC /* ArrowlessScroller.m */,
553-
7E17073E1705696F0019173D /* OverlapingScrollView.h */,
554-
7E17073F170569700019173D /* OverlapingScrollView.m */,
555568
7E16FD881706BB3000FB253E /* TransparentSplitView.h */,
556569
7E16FD891706BB3000FB253E /* TransparentSplitView.m */,
557570
7E19FFFF17005652008F40F1 /* SensorsTableView.h */,
@@ -807,6 +820,7 @@
807820
7EA2494216D8EA95002231B2 /* HWMonitorEngine.m in Sources */,
808821
7EA2494316D8EA95002231B2 /* HWMonitorSensor.m in Sources */,
809822
7EA2494416D8EA95002231B2 /* smc.c in Sources */,
823+
7E0200B218035D3700520CF7 /* RFOverlayScrollView.m in Sources */,
810824
7EA2494D16D8EB2D002231B2 /* StatusItemView.m in Sources */,
811825
7EA2495416D8EE45002231B2 /* HWMonitorGroup.m in Sources */,
812826
7EA2495516D8EE45002231B2 /* HWMonitorItem.m in Sources */,
@@ -826,9 +840,9 @@
826840
7EDDC87316FA5DA50072B15B /* Localizer.m in Sources */,
827841
7E19000117005652008F40F1 /* SensorsTableView.m in Sources */,
828842
7E19000717006727008F40F1 /* PrefsSensorCell.m in Sources */,
843+
7E0200B118035D3700520CF7 /* RFOverlayScroller.m in Sources */,
829844
7E19000A170070F3008F40F1 /* GraphsSensorCell.m in Sources */,
830845
7E7D61FB1704453B00F7222F /* FadingButton.m in Sources */,
831-
7E170740170569700019173D /* OverlapingScrollView.m in Sources */,
832846
7E16FD87170648BF00FB253E /* HWMonitorProfiles.m in Sources */,
833847
7E16FD8A1706BB3000FB253E /* TransparentSplitView.m in Sources */,
834848
7E44D95E1710433A00D06387 /* WindowFilter.m in Sources */,

‎HWMonitor/AppController.xib

+10-10
Original file line numberDiff line numberDiff line change
@@ -338,10 +338,10 @@
338338
<rect key="frame" x="17" y="17" width="286" height="411"/>
339339
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
340340
<subviews>
341-
<scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="17" horizontalPageScroll="10" verticalLineScroll="17" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="339">
341+
<scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="17" horizontalPageScroll="10" verticalLineScroll="17" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="339" customClass="RFOverlayScrollView">
342342
<rect key="frame" x="0.0" y="0.0" width="286" height="151"/>
343343
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
344-
<clipView key="contentView" copiesOnScroll="NO" id="kfm-vl-U9h">
344+
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="kfm-vl-U9h">
345345
<rect key="frame" x="1" y="1" width="284" height="149"/>
346346
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
347347
<subviews>
@@ -488,23 +488,23 @@
488488
</subviews>
489489
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
490490
</clipView>
491-
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" id="389">
491+
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" id="389" customClass="RFOverlayScroller">
492492
<rect key="frame" x="-100" y="-100" width="269" height="15"/>
493493
<autoresizingMask key="autoresizingMask"/>
494494
</scroller>
495-
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" arrowsPosition="none" controlSize="mini" id="390">
495+
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" arrowsPosition="none" controlSize="mini" id="390" customClass="RFOverlayScroller">
496496
<rect key="frame" x="274" y="1" width="11" height="141"/>
497497
<autoresizingMask key="autoresizingMask"/>
498498
</scroller>
499499
</scrollView>
500-
<scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="17" horizontalPageScroll="10" verticalLineScroll="17" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="340">
500+
<scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="17" horizontalPageScroll="10" verticalLineScroll="17" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="340" customClass="RFOverlayScrollView">
501501
<rect key="frame" x="0.0" y="160" width="286" height="251"/>
502502
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
503-
<clipView key="contentView" copiesOnScroll="NO" id="aHv-sd-Cij">
503+
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="aHv-sd-Cij">
504504
<rect key="frame" x="1" y="1" width="284" height="249"/>
505505
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
506506
<subviews>
507-
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowSizeStyle="automatic" viewBased="YES" id="341" customClass="SensorsTableView">
507+
<tableView appearanceType="aqua" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowSizeStyle="automatic" viewBased="YES" id="341" customClass="SensorsTableView">
508508
<rect key="frame" x="0.0" y="0.0" width="284" height="249"/>
509509
<autoresizingMask key="autoresizingMask"/>
510510
<size key="intercellSpacing" width="16" height="0.0"/>
@@ -665,12 +665,12 @@
665665
</subviews>
666666
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
667667
</clipView>
668-
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" id="342">
668+
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" id="342" customClass="RFOverlayScroller">
669669
<rect key="frame" x="-100" y="-100" width="269" height="15"/>
670670
<autoresizingMask key="autoresizingMask"/>
671671
</scroller>
672-
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" arrowsPosition="none" controlSize="mini" id="343">
673-
<rect key="frame" x="274" y="1" width="11" height="257"/>
672+
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" arrowsPosition="none" controlSize="mini" id="343" customClass="RFOverlayScroller">
673+
<rect key="frame" x="274" y="1" width="11" height="249"/>
674674
<autoresizingMask key="autoresizingMask"/>
675675
</scroller>
676676
</scrollView>

‎HWMonitor/GraphsController.xib

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<autoresizingMask key="autoresizingMask"/>
7474
<size key="intercellSpacing" width="1" height="0.0"/>
7575
<color key="backgroundColor" white="0.1482093978" alpha="0.5" colorSpace="calibratedWhite"/>
76-
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
76+
<color key="gridColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
7777
<tableColumns>
7878
<tableColumn width="242" minWidth="200" maxWidth="1000" id="18">
7979
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
@@ -486,11 +486,11 @@
486486
<constraints>
487487
<constraint firstAttribute="width" relation="lessThanOrEqual" constant="275" id="29t-Mh-0Je"/>
488488
</constraints>
489-
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" arrowsPosition="none" controlSize="mini" id="16" customClass="ArrowlessScroller">
489+
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" arrowsPosition="none" controlSize="mini" id="16" customClass="RFOverlayScroller">
490490
<rect key="frame" x="-100" y="-100" width="218" height="11"/>
491491
<autoresizingMask key="autoresizingMask"/>
492492
</scroller>
493-
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" arrowsPosition="none" controlSize="mini" id="15" customClass="ArrowlessScroller">
493+
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" arrowsPosition="none" controlSize="mini" id="15" customClass="RFOverlayScroller">
494494
<rect key="frame" x="-100" y="-100" width="11" height="476"/>
495495
<autoresizingMask key="autoresizingMask"/>
496496
</scroller>

‎HWMonitor/JLNFadingScrollView.m

+36-14
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@
4545
// BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4646
//
4747

48-
48+
#import <objc/objc-class.h>
4949
#import "JLNFadingScrollView.h"
50+
#import "RFOverlayScroller.h"
5051

5152

5253
#define DEFAULTFADEHEIGHT 6.0
@@ -57,6 +58,17 @@ @implementation JLNFadingScrollView
5758

5859
#pragma mark Constructors / Destructors
5960

61+
static NSComparisonResult scrollerAboveSiblingViewsComparator(NSView *view1, NSView *view2, void *context)
62+
{
63+
if ([view1 isKindOfClass:[RFOverlayScroller class]]) {
64+
return NSOrderedDescending;
65+
} else if ([view2 isKindOfClass:[RFOverlayScroller class]]) {
66+
return NSOrderedAscending;
67+
}
68+
69+
return NSOrderedSame;
70+
}
71+
6072
- (id)initWithFrame:(NSRect)frameRect
6173
{
6274
self = [super initWithFrame:frameRect];
@@ -68,10 +80,9 @@ - (id)initWithFrame:(NSRect)frameRect
6880
_bottomFadeView = nil;
6981
_fadeHeight = DEFAULTFADEHEIGHT;
7082
_fadeColor = [NSColor blackColor];
71-
83+
7284
// Kill copy on scroll
7385
[[self contentView] setCopiesOnScroll:NO];
74-
7586
}
7687

7788
return self;
@@ -134,20 +145,31 @@ - (void)setFadeColor:(NSColor *)newColor
134145

135146
- (void)tile
136147
{
137-
138148
// Super first, then fade views
139149
[super tile];
140-
141-
NSRect frame = [self bounds];
142-
143-
if ([self borderType] != NSNoBorder) {
144-
frame = NSInsetRect(frame, 1, 1);
145-
}
146-
147-
[[self contentView] setFrame:frame];
148-
149150
[self tileFadeViews];
150-
151+
152+
// Fake zero scroller width so the contentView gets drawn to the edge
153+
method_exchangeImplementations(class_getClassMethod([RFOverlayScroller class], @selector(scrollerWidthForControlSize:scrollerStyle:)),
154+
class_getClassMethod([RFOverlayScroller class], @selector(zeroWidth)));
155+
[super tile];
156+
// Restore original scroller width
157+
method_exchangeImplementations(class_getClassMethod([RFOverlayScroller class], @selector(scrollerWidthForControlSize:scrollerStyle:)),
158+
class_getClassMethod([RFOverlayScroller class], @selector(zeroWidth)));
159+
160+
// Resize vertical scroller
161+
CGFloat width = [RFOverlayScroller scrollerWidthForControlSize:self.verticalScroller.controlSize
162+
scrollerStyle:self.verticalScroller.scrollerStyle];
163+
[self.verticalScroller setFrame:(NSRect){
164+
self.bounds.size.width - width,
165+
0.0f,
166+
width,
167+
self.bounds.size.height
168+
}];
169+
170+
// Move scroller to front
171+
[self sortSubviewsUsingFunction:scrollerAboveSiblingViewsComparator
172+
context:NULL];
151173
}
152174

153175
- (void)tileFadeViews

0 commit comments

Comments
 (0)