diff --git a/dlangui-monod-linux.dproj b/dlangui-monod-linux.dproj index a2351c67..c46bd3c7 100644 --- a/dlangui-monod-linux.dproj +++ b/dlangui-monod-linux.dproj @@ -166,6 +166,21 @@ -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi +-Jviews/res/hdpi + false + libdlangui-monod-linux + StaticLibrary + true + 0 + + + bin\DebugX11 + obj/DebugX11 + false + -Jviews +-Jviews/res +-Jviews/res/i18n +-Jviews/res/mdpi -Jviews/res/hdpi false libdlangui-monod-linux diff --git a/dlangui-monod-linux.sln b/dlangui-monod-linux.sln index d8b42fb3..c2bb7980 100644 --- a/dlangui-monod-linux.sln +++ b/dlangui-monod-linux.sln @@ -19,12 +19,15 @@ Global DebugMinimal|Any CPU = DebugMinimal|Any CPU ReleaseMinimal|Any CPU = ReleaseMinimal|Any CPU UnittestMinimal|Any CPU = UnittestMinimal|Any CPU + DebugX11|Any CPU = DebugX11|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {075C374A-563A-4CAC-9E9F-0B6E1DFEAEC3}.Debug|Any CPU.ActiveCfg = Release|x64 - {075C374A-563A-4CAC-9E9F-0B6E1DFEAEC3}.Debug|Any CPU.Build.0 = Release|x64 + {075C374A-563A-4CAC-9E9F-0B6E1DFEAEC3}.Debug|Any CPU.ActiveCfg = Debug|x64 + {075C374A-563A-4CAC-9E9F-0B6E1DFEAEC3}.Debug|Any CPU.Build.0 = Debug|x64 {075C374A-563A-4CAC-9E9F-0B6E1DFEAEC3}.DebugMinimal|Any CPU.ActiveCfg = DebugMinimal|x64 {075C374A-563A-4CAC-9E9F-0B6E1DFEAEC3}.DebugMinimal|Any CPU.Build.0 = DebugMinimal|x64 + {075C374A-563A-4CAC-9E9F-0B6E1DFEAEC3}.DebugX11|Any CPU.ActiveCfg = DebugX11|Any CPU + {075C374A-563A-4CAC-9E9F-0B6E1DFEAEC3}.DebugX11|Any CPU.Build.0 = DebugX11|Any CPU {075C374A-563A-4CAC-9E9F-0B6E1DFEAEC3}.Release|Any CPU.ActiveCfg = Release|Any CPU {075C374A-563A-4CAC-9E9F-0B6E1DFEAEC3}.Release|Any CPU.Build.0 = Release|Any CPU {075C374A-563A-4CAC-9E9F-0B6E1DFEAEC3}.ReleaseMinimal|Any CPU.ActiveCfg = ReleaseMinimal|x64 @@ -33,10 +36,12 @@ Global {075C374A-563A-4CAC-9E9F-0B6E1DFEAEC3}.Unittest|Any CPU.Build.0 = Unittest|x64 {075C374A-563A-4CAC-9E9F-0B6E1DFEAEC3}.UnittestMinimal|Any CPU.ActiveCfg = UnittestMinimal|x64 {075C374A-563A-4CAC-9E9F-0B6E1DFEAEC3}.UnittestMinimal|Any CPU.Build.0 = UnittestMinimal|x64 - {0A3A0D08-E4DC-418E-B92B-561CC91C2306}.Debug|Any CPU.ActiveCfg = Release|x64 - {0A3A0D08-E4DC-418E-B92B-561CC91C2306}.Debug|Any CPU.Build.0 = Release|x64 + {0A3A0D08-E4DC-418E-B92B-561CC91C2306}.Debug|Any CPU.ActiveCfg = Debug|x64 + {0A3A0D08-E4DC-418E-B92B-561CC91C2306}.Debug|Any CPU.Build.0 = Debug|x64 {0A3A0D08-E4DC-418E-B92B-561CC91C2306}.DebugMinimal|Any CPU.ActiveCfg = DebugMinimal|x64 {0A3A0D08-E4DC-418E-B92B-561CC91C2306}.DebugMinimal|Any CPU.Build.0 = DebugMinimal|x64 + {0A3A0D08-E4DC-418E-B92B-561CC91C2306}.DebugX11|Any CPU.ActiveCfg = DebugX11|Any CPU + {0A3A0D08-E4DC-418E-B92B-561CC91C2306}.DebugX11|Any CPU.Build.0 = DebugX11|Any CPU {0A3A0D08-E4DC-418E-B92B-561CC91C2306}.Release|Any CPU.ActiveCfg = Release|Any CPU {0A3A0D08-E4DC-418E-B92B-561CC91C2306}.Release|Any CPU.Build.0 = Release|Any CPU {0A3A0D08-E4DC-418E-B92B-561CC91C2306}.ReleaseMinimal|Any CPU.ActiveCfg = ReleaseMinimal|x64 @@ -45,10 +50,12 @@ Global {0A3A0D08-E4DC-418E-B92B-561CC91C2306}.Unittest|Any CPU.Build.0 = Unittest|x64 {0A3A0D08-E4DC-418E-B92B-561CC91C2306}.UnittestMinimal|Any CPU.ActiveCfg = UnittestMinimal|x64 {0A3A0D08-E4DC-418E-B92B-561CC91C2306}.UnittestMinimal|Any CPU.Build.0 = UnittestMinimal|x64 - {54BDE028-6064-4CA9-B6CA-4C0BEEE70F24}.Debug|Any CPU.ActiveCfg = Release|x64 - {54BDE028-6064-4CA9-B6CA-4C0BEEE70F24}.Debug|Any CPU.Build.0 = Release|x64 + {54BDE028-6064-4CA9-B6CA-4C0BEEE70F24}.Debug|Any CPU.ActiveCfg = Debug|x64 + {54BDE028-6064-4CA9-B6CA-4C0BEEE70F24}.Debug|Any CPU.Build.0 = Debug|x64 {54BDE028-6064-4CA9-B6CA-4C0BEEE70F24}.DebugMinimal|Any CPU.ActiveCfg = DebugMinimal|x64 {54BDE028-6064-4CA9-B6CA-4C0BEEE70F24}.DebugMinimal|Any CPU.Build.0 = DebugMinimal|x64 + {54BDE028-6064-4CA9-B6CA-4C0BEEE70F24}.DebugX11|Any CPU.ActiveCfg = DebugX11|x64 + {54BDE028-6064-4CA9-B6CA-4C0BEEE70F24}.DebugX11|Any CPU.Build.0 = DebugX11|x64 {54BDE028-6064-4CA9-B6CA-4C0BEEE70F24}.Release|Any CPU.ActiveCfg = Release|Any CPU {54BDE028-6064-4CA9-B6CA-4C0BEEE70F24}.Release|Any CPU.Build.0 = Release|Any CPU {54BDE028-6064-4CA9-B6CA-4C0BEEE70F24}.ReleaseMinimal|Any CPU.ActiveCfg = ReleaseMinimal|x64 @@ -57,10 +64,12 @@ Global {54BDE028-6064-4CA9-B6CA-4C0BEEE70F24}.Unittest|Any CPU.Build.0 = Unittest|x64 {54BDE028-6064-4CA9-B6CA-4C0BEEE70F24}.UnittestMinimal|Any CPU.ActiveCfg = UnittestMinimal|x64 {54BDE028-6064-4CA9-B6CA-4C0BEEE70F24}.UnittestMinimal|Any CPU.Build.0 = UnittestMinimal|x64 - {8E722D80-CF8D-4D98-BEAE-7BC9E6752AC4}.Debug|Any CPU.ActiveCfg = Release|x64 - {8E722D80-CF8D-4D98-BEAE-7BC9E6752AC4}.Debug|Any CPU.Build.0 = Release|x64 + {8E722D80-CF8D-4D98-BEAE-7BC9E6752AC4}.Debug|Any CPU.ActiveCfg = Debug|x64 + {8E722D80-CF8D-4D98-BEAE-7BC9E6752AC4}.Debug|Any CPU.Build.0 = Debug|x64 {8E722D80-CF8D-4D98-BEAE-7BC9E6752AC4}.DebugMinimal|Any CPU.ActiveCfg = DebugMinimal|x64 {8E722D80-CF8D-4D98-BEAE-7BC9E6752AC4}.DebugMinimal|Any CPU.Build.0 = DebugMinimal|x64 + {8E722D80-CF8D-4D98-BEAE-7BC9E6752AC4}.DebugX11|Any CPU.ActiveCfg = DebugX11|x64 + {8E722D80-CF8D-4D98-BEAE-7BC9E6752AC4}.DebugX11|Any CPU.Build.0 = DebugX11|x64 {8E722D80-CF8D-4D98-BEAE-7BC9E6752AC4}.Release|Any CPU.ActiveCfg = Release|Any CPU {8E722D80-CF8D-4D98-BEAE-7BC9E6752AC4}.Release|Any CPU.Build.0 = Release|Any CPU {8E722D80-CF8D-4D98-BEAE-7BC9E6752AC4}.ReleaseMinimal|Any CPU.ActiveCfg = ReleaseMinimal|x64 @@ -69,10 +78,12 @@ Global {8E722D80-CF8D-4D98-BEAE-7BC9E6752AC4}.Unittest|Any CPU.Build.0 = Unittest|x64 {8E722D80-CF8D-4D98-BEAE-7BC9E6752AC4}.UnittestMinimal|Any CPU.ActiveCfg = UnittestMinimal|x64 {8E722D80-CF8D-4D98-BEAE-7BC9E6752AC4}.UnittestMinimal|Any CPU.Build.0 = UnittestMinimal|x64 - {A38BEF21-AAFE-4115-A978-63B7C8C2FBD1}.Debug|Any CPU.ActiveCfg = ReleaseMinimal|x64 - {A38BEF21-AAFE-4115-A978-63B7C8C2FBD1}.Debug|Any CPU.Build.0 = ReleaseMinimal|x64 + {A38BEF21-AAFE-4115-A978-63B7C8C2FBD1}.Debug|Any CPU.ActiveCfg = Debug|x64 + {A38BEF21-AAFE-4115-A978-63B7C8C2FBD1}.Debug|Any CPU.Build.0 = Debug|x64 {A38BEF21-AAFE-4115-A978-63B7C8C2FBD1}.DebugMinimal|Any CPU.ActiveCfg = DebugMinimal|x64 {A38BEF21-AAFE-4115-A978-63B7C8C2FBD1}.DebugMinimal|Any CPU.Build.0 = DebugMinimal|x64 + {A38BEF21-AAFE-4115-A978-63B7C8C2FBD1}.DebugX11|Any CPU.ActiveCfg = DebugX11|x64 + {A38BEF21-AAFE-4115-A978-63B7C8C2FBD1}.DebugX11|Any CPU.Build.0 = DebugX11|x64 {A38BEF21-AAFE-4115-A978-63B7C8C2FBD1}.Release|Any CPU.ActiveCfg = Release|Any CPU {A38BEF21-AAFE-4115-A978-63B7C8C2FBD1}.Release|Any CPU.Build.0 = Release|Any CPU {A38BEF21-AAFE-4115-A978-63B7C8C2FBD1}.ReleaseMinimal|Any CPU.ActiveCfg = ReleaseMinimal|x64 diff --git a/examples/example1/example1-monod-linux.dproj b/examples/example1/example1-monod-linux.dproj index 3eef1003..6df8f103 100644 --- a/examples/example1/example1-monod-linux.dproj +++ b/examples/example1/example1-monod-linux.dproj @@ -192,11 +192,22 @@ true 0 -lX11 - - - -L-lX11 - - + + + bin\DebugX11 + obj/DebugX11 + false + -Jviews +-Jviews/res +-Jviews/res/hdpi +-Jviews/res/mdpi +-Jviews/res/i18n + + false + example1-monod-linux + Executable + true + 0 diff --git a/examples/helloworld/helloworld-monod-linux.dproj b/examples/helloworld/helloworld-monod-linux.dproj index c4144341..096a3910 100644 --- a/examples/helloworld/helloworld-monod-linux.dproj +++ b/examples/helloworld/helloworld-monod-linux.dproj @@ -150,6 +150,16 @@ + + bin\DebugX11 + obj/DebugX11 + false + false + helloworld-monod-linux + Executable + true + 0 + diff --git a/src/dlangui/platforms/x11/x11app.d b/src/dlangui/platforms/x11/x11app.d index b3e03e16..c1ad8d03 100644 --- a/src/dlangui/platforms/x11/x11app.d +++ b/src/dlangui/platforms/x11/x11app.d @@ -51,7 +51,7 @@ class X11Window : dlangui.platforms.common.platform.Window { _win = XCreateSimpleWindow(x11display, DefaultRootWindow(x11display), 0, 0, _dx, _dy, 5, white, black); - readln(); + //readln(); /* here is where some properties of the window can be set. The third and fourth items indicate the name which appears