Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GTK shape support WIP #348

Merged
merged 25 commits into from
Jan 12, 2021
Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
07f73cb
GTK shape support WIP
mortenbekditlevsen Jan 6, 2021
61ffb56
Clean up
mortenbekditlevsen Jan 6, 2021
654ec9b
Delete File.swift
mortenbekditlevsen Jan 6, 2021
1ae264e
Support for ellipsis
mortenbekditlevsen Jan 6, 2021
6312cdc
Merge branch 'gtk-shapes' of https://github.com/TokamakUI/Tokamak int…
mortenbekditlevsen Jan 6, 2021
399151e
Allow drawing 'outside' of current frame. Experimental.
mortenbekditlevsen Jan 6, 2021
7c5df05
Update StaticHTML Path drawing (in blind)
mortenbekditlevsen Jan 6, 2021
76340ba
Fix elements access
mortenbekditlevsen Jan 7, 2021
d15af10
Updated copyright notics
mortenbekditlevsen Jan 7, 2021
6de26d6
Fix path bounding rect and a few linter warnings
mortenbekditlevsen Jan 7, 2021
55b43e3
Fix linter warnings
mortenbekditlevsen Jan 7, 2021
68b88e2
Correctly support Capsules (rounded rects with nil cornerSize)
mortenbekditlevsen Jan 7, 2021
7bc3456
Fix GSignal up a bit
mortenbekditlevsen Jan 7, 2021
cee36dc
Fix linter warnings
mortenbekditlevsen Jan 7, 2021
e3224fc
Fix linter warnings
mortenbekditlevsen Jan 7, 2021
8b40db9
Re-added 'indirect' on Storage case since I realized that it is there…
mortenbekditlevsen Jan 7, 2021
d9bfbb1
Removed superfluous import statement
mortenbekditlevsen Jan 7, 2021
5985393
Use boundingRect.size for Path size
mortenbekditlevsen Jan 8, 2021
8b83e09
Clean up after review
mortenbekditlevsen Jan 8, 2021
fe0457c
Refactored GdkRGBA from AnyColorBox.ResolvedValue to be reusable
mortenbekditlevsen Jan 10, 2021
2a3ec53
It's enough only to include gdk-3.0 in pkg-config. I also believe tha…
mortenbekditlevsen Jan 10, 2021
6d4130a
Added 'resolveToCairo(in environment:)' extension on Color
mortenbekditlevsen Jan 10, 2021
bd0b3b8
Create slightly lighter View type hierarchies
mortenbekditlevsen Jan 11, 2021
6b8b643
Removed workaround for environment not being injected when stroking i…
mortenbekditlevsen Jan 11, 2021
e84c72e
Ran swiftformat
mortenbekditlevsen Jan 12, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LINKER_FLAGS := $(shell pkg-config --libs gtk+-3.0)
LINKER_FLAGS := $(shell pkg-config --libs gtk+-3.0 gdk-3.0)
C_FLAGS := $(shell pkg-config --cflags gtk+-3.0)
SWIFT_LINKER_FLAGS ?= -Xlinker $(shell echo $(LINKER_FLAGS) | sed -e "s/ / -Xlinker /g" | sed -e "s/-Xlinker -Wl,-framework,/-Xlinker -framework -Xlinker /g")
SWIFT_C_FLAGS ?= -Xcc $(shell echo $(C_FLAGS) | sed -e "s/ / -Xcc /g")
Expand Down
11 changes: 10 additions & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,22 @@ let package = Package(
.brew(["gtk+3"]),
]
),
.systemLibrary(
name: "CGDK",
pkgConfig: "gdk-3.0",
providers: [
.apt(["libgtk+-3.0", "gtk+-3.0"]),
// .yum(["gtk3-devel"]),
.brew(["gtk+3"]),
]
),
.target(
name: "TokamakGTKCHelpers",
dependencies: ["CGTK"]
),
.target(
name: "TokamakGTK",
dependencies: ["TokamakCore", "CGTK", "TokamakGTKCHelpers", "CombineShim"]
dependencies: ["TokamakCore", "CGTK", "CGDK", "TokamakGTKCHelpers", "CombineShim"]
),
.target(
name: "TokamakGTKDemo",
Expand Down
1 change: 1 addition & 0 deletions Sources/CGDK/CGDK-Bridging-Header.h
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <gdk/gdk.h>
8 changes: 8 additions & 0 deletions Sources/CGDK/module.modulemap
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module CGDK {
header "./termios-Header.h"
header "./CGDK-Bridging-Header.h"

link "gdk-3"

export *
}
1 change: 1 addition & 0 deletions Sources/CGDK/termios-Header.h
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <termios.h>
Loading