TermiT/Flycut
1
1
Fork 0
mirror of https://github.com/TermiT/Flycut.git synced 2024-09-20 15:26:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

for now removed pop up animation (need to rewrite it using NSAnimationContext)

Browse source
This commit is contained in:
Gennadiy Potapov 2016-04-03 15:39:44 +08:00
parent b3c1c5b14b
commit 5e259802d9
4 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
AppController.m
View file

@ -70,7 +70,7 @@
@"saveForgottenClippings",
[NSNumber numberWithBool:YES],
@"saveForgottenFavorites",
[NSNumber numberWithBool:(floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_9)],
[NSNumber numberWithBool:NO],
@"popUpAnimation",
[NSNumber numberWithBool:NO],
@"pasteMovesToTop",
@ -536,12 +536,12 @@
[appearancePanel addSubview:row];
nextYMax = row.frame.origin.y;
row = [self preferencePanelCheckboxRowForText:@"Animate bezel appearance"
frameMaxY:nextYMax
binding:@"popUpAnimation"
action:nil];
[appearancePanel addSubview:row];
nextYMax = row.frame.origin.y;
// row = [self preferencePanelCheckboxRowForText:@"Animate bezel appearance"
// frameMaxY:nextYMax
// binding:@"popUpAnimation"
// action:nil];
// [appearancePanel addSubview:row];
// nextYMax = row.frame.origin.y;
row = [self preferencePanelCheckboxRowForText:@"Show clipping source app and time"
frameMaxY:nextYMax
@ -1046,8 +1046,8 @@
bezel.frame.size.height) display:YES];
if ([bezel respondsToSelector:@selector(setCollectionBehavior:)])
[bezel setCollectionBehavior:NSWindowCollectionBehaviorCanJoinAllSpaces];
if ([[NSUserDefaults standardUserDefaults] boolForKey:@"popUpAnimation"])
[bezel makeKeyAndOrderFrontWithPopEffect];
// if ([[NSUserDefaults standardUserDefaults] boolForKey:@"popUpAnimation"])
// [bezel makeKeyAndOrderFrontWithPopEffect];
else [bezel makeKeyAndOrderFront:self];
isBezelDisplayed = YES;
}

10
English.lproj/MainMenu.nib/designable.nib generated
View file

@ -238,7 +238,7 @@
<rect key="frame" x="79" y="174" width="25" height="22"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" state="on" id="758">
<numberFormatter key="formatter" formatterBehavior="10_0" positiveFormat="#" negativeFormat="-#" hasThousandSeparators="NO" thousandSeparator=" " id="483">
<numberFormatter key="formatter" formatterBehavior="10_0" positiveFormat="#" negativeFormat="-#" hasThousandSeparators="NO" thousandSeparator=" " id="483">
<attributedString key="attributedStringForZero">
<fragment content="0"/>
</attributedString>
@ -257,7 +257,7 @@
<rect key="frame" x="224" y="174" width="24" height="22"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" state="on" id="759">
<numberFormatter key="formatter" formatterBehavior="10_0" positiveFormat="#" negativeFormat="-#" hasThousandSeparators="NO" thousandSeparator=" " id="484">
<numberFormatter key="formatter" formatterBehavior="10_0" positiveFormat="#" negativeFormat="-#" hasThousandSeparators="NO" thousandSeparator=" " id="484">
<attributedString key="attributedStringForZero">
<fragment content="0"/>
</attributedString>
@ -511,10 +511,10 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<box identifier="testbox" title="Box" boxType="oldStyle" borderType="none" titlePosition="noTitle" id="EFy-pc-aKl" userLabel="Box - Box">
<rect key="frame" x="0.0" y="155" width="502" height="316"/>
<rect key="frame" x="0.0" y="189" width="502" height="282"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView">
<rect key="frame" x="0.0" y="0.0" width="502" height="316"/>
<rect key="frame" x="0.0" y="0.0" width="502" height="282"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</view>
<color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
@ -540,7 +540,7 @@
<autoresizingMask key="autoresizingMask"/>
<clipView key="contentView" id="Yuw-af-7PF">
<rect key="frame" x="1" y="1" width="474" height="344"/>
<autoresizingMask key="autoresizingMask"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textView editable="NO" importsGraphics="NO" richText="NO" usesRuler="YES" usesFontPanel="YES" verticallyResizable="YES" spellingCorrection="YES" smartInsertDelete="YES" id="357">
<rect key="frame" x="0.0" y="0.0" width="474" height="344"/>

BIN
English.lproj/MainMenu.nib/keyedobjects.nib generated
View file

Binary file not shown.

9
UI/BezelWindow.m
View file

@ -324,6 +324,15 @@ static const float lineHeight = 16;
return NO;
}
- (void)scrollWheel:(NSEvent *)theEvent
{
if ( [self delegate] )
{
[delegate performSelector:@selector(processBezelMouseEvents:) withObject:theEvent];
}
}
- (void)keyDown:(NSEvent *)theEvent {
if ( [self delegate] )
{