OSX iOS support appearance colours (PR #25853)
Stefan Csomor
You can view, comment on, or merge this pull request online at:
https://github.com/wxWidgets/wxWidgets/pull/25853
Commit Summary
- a46d232 add type for uicolor into wx space, add a new WXColor type resolving to either NSColor or UIColor
- a80003c new file src/iphone/colour.mm added
- 0c53749 fixing regex warning by switching to raw strings
- 7b1e1aa bringing cocoa and ios implementations closer, adding appearance to ios colours
File Changes
(12 files)
- M Makefile.in (236)
- M build/bakefiles/files.bkl (1)
- M build/cmake/files.cmake (1)
- M build/files (1)
- M build/osx/fix_xcode_ids.py (14)
- M build/osx/wxcocoa.xcodeproj/project.pbxproj (18852)
- M build/osx/wxiphone.xcodeproj/project.pbxproj (5234)
- M include/wx/defs.h (3)
- M src/osx/cocoa/colour.mm (35)
- M src/osx/core/colour.cpp (42)
- A src/osx/iphone/colour.mm (201)
- M src/osx/iphone/settings.mm (92)
Patch Links:
- https://github.com/wxWidgets/wxWidgets/pull/25853.patch
- https://github.com/wxWidgets/wxWidgets/pull/25853.diff
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
@vadz commented on this pull request.
I am not sure why all trailing whitespace got removed from Makefile.in, but we probably don't want to do this, as it will be added back during next regeneration.
> +// Author: Vadim Zeitlin +// Created: 2015-11-26 (completely replacing the old version of the file) +// Copyright: (c) 2015 Vadim Zeitlin
My name shouldn't be here.
In src/osx/iphone/settings.mm:
> + {
+ return defaultValue;
+ }
+
+ return [setting intValue];
+}
+
+// ----------------------------------------------------------------------------
+// wxSystemAppearance
+// ----------------------------------------------------------------------------
+
+wxString wxSystemAppearance::GetName() const
+{
+ UITraitCollection* traitCollection = [UIScreen mainScreen].traitCollection;
+ if (traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark)
+ return wxT("Dark");
We shouldn't use wxT() in new code, it should be either wxS() or nothing at all.
- return wxT("Dark");
+ return wxS("Dark");
In src/osx/iphone/settings.mm:
> + }
+
+ return [setting intValue];
+}
+
+// ----------------------------------------------------------------------------
+// wxSystemAppearance
+// ----------------------------------------------------------------------------
+
+wxString wxSystemAppearance::GetName() const
+{
+ UITraitCollection* traitCollection = [UIScreen mainScreen].traitCollection;
+ if (traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark)
+ return wxT("Dark");
+ else if (traitCollection.userInterfaceStyle == UIUserInterfaceStyleLight)
+ return wxT("Light");
⬇️ Suggested change
- return wxT("Light");
+ return wxS("Light");
In src/osx/iphone/settings.mm:
> + return [setting intValue];
+}
+
+// ----------------------------------------------------------------------------
+// wxSystemAppearance
+// ----------------------------------------------------------------------------
+
+wxString wxSystemAppearance::GetName() const
+{
+ UITraitCollection* traitCollection = [UIScreen mainScreen].traitCollection;
+ if (traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark)
+ return wxT("Dark");
+ else if (traitCollection.userInterfaceStyle == UIUserInterfaceStyleLight)
+ return wxT("Light");
+ else
+ return wxT("Unspecified");
⬇️ Suggested change
- return wxT("Unspecified");
+ return wxS("Unspecified");
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Stefan Csomor
@csomor pushed 1 commit.
- 0db2960 missing header
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Stefan Csomor
@csomor pushed 1 commit.
- 9ca74d2 Update src/osx/iphone/settings.mm
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Stefan Csomor
@csomor pushed 1 commit.
- 0bd2326 Update src/osx/iphone/settings.mm
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Stefan Csomor
@csomor pushed 1 commit.
- 350cf95 Update src/osx/iphone/settings.mm
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Stefan Csomor
@csomor commented on this pull request.
> +// Author: Vadim Zeitlin +// Created: 2015-11-26 (completely replacing the old version of the file) +// Copyright: (c) 2015 Vadim Zeitlin
sorry, copied the headers over from the cocoa version ...
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Stefan Csomor
csomor left a comment (wxWidgets/wxWidgets#25853)I am not sure why all trailing whitespace got removed from
Makefile.in, but we probably don't want to do this, as it will be added back during next regeneration.
oh, sorry, my BBEdit seems to have messed this up
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Stefan Csomor
@csomor pushed 2 commits.
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Stefan Csomor
@csomor pushed 1 commit.
- 54286b0 switching usage from OSXGetNSColor to generic OSXGetWXColor
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Stefan Csomor
@csomor pushed 1 commit.
- 83cbbfd missed replacement in header
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Stefan Csomor
@csomor pushed 1 commit.
- 7c0385e switch colorspace
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Stefan Csomor
@csomor pushed 1 commit.
- 15e9f71 another attempt at getting unchanged component values
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Stefan Csomor
@csomor pushed 1 commit.
- 3eedc0a use CGColor for component wise color creation,
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Stefan Csomor
Merged #25853 into master.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.