Skip to content

Commit

Permalink
Fixed Bug that caused crash on 10.8
Browse files Browse the repository at this point in the history
Bumped version and build
  • Loading branch information
HendrikNoeller committed Mar 25, 2017
1 parent 7b5a2e1 commit d7d1a70
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
8 changes: 6 additions & 2 deletions Writer.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,7 @@
B138B57219E1C973000489C4 = {
CreatedOnToolsVersion = 6.0.1;
DevelopmentTeam = RX98DMF4TJ;
ProvisioningStyle = Manual;
SystemCapabilities = {
com.apple.Maps.Mac = {
enabled = 0;
Expand Down Expand Up @@ -595,14 +596,16 @@
CODE_SIGN_IDENTITY = "Mac Developer";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = RX98DMF4TJ;
INFOPLIST_FILE = Writer/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.8;
OTHER_LDFLAGS = "-licucore";
"OTHER_LDFLAGS[arch=*]" = "-licucore";
PRODUCT_BUNDLE_IDENTIFIER = de.HendrikNoeller.Writer;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "1fb912d3-f6d9-4f87-aa4a-ac45325e173a";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
};
name = Debug;
};
Expand All @@ -614,14 +617,15 @@
CODE_SIGN_IDENTITY = "Mac Developer";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = RX98DMF4TJ;
INFOPLIST_FILE = Writer/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.8;
OTHER_LDFLAGS = "-licucore";
"OTHER_LDFLAGS[arch=*]" = "-licucore";
PRODUCT_BUNDLE_IDENTIFIER = de.HendrikNoeller.Writer;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "1fb912d3-f6d9-4f87-aa4a-ac45325e173a";
PROVISIONING_PROFILE = "";
};
name = Release;
};
Expand Down
4 changes: 2 additions & 2 deletions Writer/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.1</string>
<string>2.1.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>6</string>
<string>7</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.productivity</string>
<key>LSMinimumSystemVersion</key>
Expand Down
14 changes: 7 additions & 7 deletions Writer/ThemeManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ - (NSColor*)colorFromArray:(NSArray*)array
double red = redValue.doubleValue / 255.0;
double green = greenValue.doubleValue / 255.0;
double blue = blueValue.doubleValue / 255.0;
return [NSColor colorWithRed:red green:green blue:blue alpha:1.0];
return [NSColor colorWithCalibratedRed:red green:green blue:blue alpha:1.0];
}

#pragma mark Value Access
Expand Down Expand Up @@ -220,12 +220,12 @@ - (Theme *)fallbackTheme
{
if (!_fallbackTheme) {
_fallbackTheme = [[Theme alloc] init];
_fallbackTheme.backgroundColor = [NSColor colorWithWhite:0.0 alpha:1.0];
_fallbackTheme.selectionColor = [NSColor colorWithWhite:0.8 alpha:1.0];
_fallbackTheme.textColor = [NSColor colorWithWhite:1.0 alpha:1.0];
_fallbackTheme.invisibleTextColor = [NSColor colorWithWhite:0.7 alpha:1.0];
_fallbackTheme.caretColor = [NSColor colorWithWhite:0.1 alpha:1.0];
_fallbackTheme.commentColor = [NSColor colorWithWhite:0.5 alpha:1.0];
_fallbackTheme.backgroundColor = [NSColor colorWithCalibratedWhite:0.0 alpha:1.0];
_fallbackTheme.selectionColor = [NSColor colorWithCalibratedWhite:0.8 alpha:1.0];
_fallbackTheme.textColor = [NSColor colorWithCalibratedWhite:1.0 alpha:1.0];
_fallbackTheme.invisibleTextColor = [NSColor colorWithCalibratedWhite:0.7 alpha:1.0];
_fallbackTheme.caretColor = [NSColor colorWithCalibratedWhite:0.1 alpha:1.0];
_fallbackTheme.commentColor = [NSColor colorWithCalibratedWhite:0.5 alpha:1.0];
}
return _fallbackTheme;
}
Expand Down

0 comments on commit d7d1a70

Please sign in to comment.