Skip to content

Commit 7772b33

Browse files
Merge pull request #90 from summer-alice/add_cTabFolderRenderer
Start CTabFolderRenderer port
2 parents b54c611 + f9f4cc1 commit 7772b33

File tree

4 files changed

+507
-6
lines changed

4 files changed

+507
-6
lines changed

dub.sdl

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ subPackage {
1818
configuration "linux-gtk" {
1919
platforms "linux"
2020
sourcePaths "org.eclipse.swt.gtk.linux.x86/src" \
21-
"org.eclipse.swt/Eclipse SWT/common"
21+
"org.eclipse.swt/Eclipse SWT/common" \
22+
"org.eclipse.swt/Eclipse SWT Custom Widgets/common"
2223
importPaths "org.eclipse.swt.gtk.linux.x86/src" \
23-
"org.eclipse.swt/Eclipse SWT/common"
24+
"org.eclipse.swt/Eclipse SWT/common" \
25+
"org.eclipse.swt/Eclipse SWT Custom Widgets/common"
2426
stringImportPaths "org.eclipse.swt.gtk.linux.x86/res"
2527

2628
excludedSourceFiles \
@@ -33,9 +35,11 @@ configuration "linux-gtk" {
3335
configuration "windows-win32" {
3436
platforms "windows"
3537
sourcePaths "org.eclipse.swt.win32.win32.x86/src" \
36-
"org.eclipse.swt/Eclipse SWT/common"
38+
"org.eclipse.swt/Eclipse SWT/common" \
39+
"org.eclipse.swt/Eclipse SWT Custom Widgets/common"
3740
importPaths "org.eclipse.swt.win32.win32.x86/src" \
38-
"org.eclipse.swt/Eclipse SWT/common"
41+
"org.eclipse.swt/Eclipse SWT/common" \
42+
"org.eclipse.swt/Eclipse SWT Custom Widgets/common"
3943
stringImportPaths "org.eclipse.swt.win32.win32.x86/res"
4044

4145
excludedSourceFiles \
@@ -70,12 +74,14 @@ configuration "unittest-gtk" {
7074
sourcePaths \
7175
"tests/" \
7276
"org.eclipse.swt.gtk.linux.x86/src" \
73-
"org.eclipse.swt/Eclipse SWT/common"
77+
"org.eclipse.swt/Eclipse SWT/common" \
78+
"org.eclipse.swt/Eclipse SWT Custom Widgets/common"
7479

7580
importPaths \
7681
"tests/" \
7782
"org.eclipse.swt.gtk.linux.x86/src" \
78-
"org.eclipse.swt/Eclipse SWT/common"
83+
"org.eclipse.swt/Eclipse SWT/common" \
84+
"org.eclipse.swt/Eclipse SWT Custom Widgets/common"
7985

8086
stringImportPaths "org.eclipse.swt.gtk.linux.x86/res"
8187

org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CTabFolder.d

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ public class CTabFolder : Composite {
147147
int fixedTabHeight = SWT.DEFAULT;
148148
int tabHeight;
149149
int minChars = 20;
150+
bool borderVisible = false;
150151

151152
/* item management */
152153
CTabItem[] items;
@@ -337,6 +338,7 @@ public this(Composite parent, int style) {
337338
// showMin = (style2 & SWT.MIN) !is 0; - conflicts with SWT.TOP
338339
// showMax = (style2 & SWT.MAX) !is 0; - conflicts with SWT.BOTTOM
339340
single = (style2 & SWT.SINGLE) !is 0;
341+
borderVisible = (style & SWT.BORDER) !is 0;
340342
borderLeft = borderRight = (style & SWT.BORDER) !is 0 ? 1 : 0;
341343
borderTop = onBottom ? borderLeft : 0;
342344
borderBottom = onBottom ? 0 : borderLeft;

org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/CTabFolder.d

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ public class CTabFolder : Composite {
147147
int fixedTabHeight = SWT.DEFAULT;
148148
int tabHeight;
149149
int minChars = 20;
150+
bool borderVisible = false;
150151

151152
/* item management */
152153
CTabItem[] items;
@@ -337,6 +338,7 @@ public this(Composite parent, int style) {
337338
// showMin = (style2 & SWT.MIN) !is 0; - conflicts with SWT.TOP
338339
// showMax = (style2 & SWT.MAX) !is 0; - conflicts with SWT.BOTTOM
339340
single = (style2 & SWT.SINGLE) !is 0;
341+
borderVisible = (style & SWT.BORDER) !is 0;
340342
borderLeft = borderRight = (style & SWT.BORDER) !is 0 ? 1 : 0;
341343
borderTop = onBottom ? borderLeft : 0;
342344
borderBottom = onBottom ? 0 : borderLeft;

0 commit comments

Comments
 (0)