Skip to content

Draft: Windows build: Do not merge #152

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.

Sign up for GitHub

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

Closed
MakiWolf wants to merge 36 commits into from
Closed

Draft: Windows build: Do not merge #152

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
44cffd2
Look in Mono for Windows install dir for monodoc.dll
May 1, 2018
047d83c
Remove duplicate monodoc.dll reference
May 1, 2018
eb09226
update
MakiWolf Jan 26, 2024
588bcaa
Update Directory.Build.props
MakiWolf Jan 26, 2024
8504ba7
Update .gitmodules
MakiWolf Jan 26, 2024
ce962c1
Update .gitmodules
MakiWolf Jan 26, 2024
ce6e331
Update Main.sln
MakiWolf Jan 26, 2024
a4643ee
update
MakiWolf Jan 26, 2024
93c2f90
update
MakiWolf Jan 26, 2024
db74c2e
update
MakiWolf Jan 26, 2024
86a1455
update
MakiWolf Jan 26, 2024
0434283
update
MakiWolf Jan 26, 2024
320e159
update
MakiWolf Jan 26, 2024
4154fa2
update
MakiWolf Jan 26, 2024
ba83ea4
update
MakiWolf Jan 27, 2024
94f5b6a
update
MakiWolf Jan 27, 2024
8651af7
update
MakiWolf Jan 27, 2024
6a16eb9
update
MakiWolf Jan 27, 2024
4b351af
update
MakiWolf Jan 27, 2024
a5f2dbe
Merge branch 'use-mono-for-monodoc-on-windows' of https://github.com/…
MakiWolf Jan 27, 2024
892acb1
update
MakiWolf Jan 27, 2024
2806eca
remove gtk3
MakiWolf Jan 27, 2024
7be19f6
update
MakiWolf Feb 3, 2024
b54a76f
update
MakiWolf Feb 3, 2024
513d744
update
MakiWolf Feb 4, 2024
5fc1c86
update
MakiWolf Feb 4, 2024
1c0e67f
Merge branch 'windows' of https://github.com/MakiWolf/dotdevelop into…
MakiWolf Feb 4, 2024
47af2eb
update
MakiWolf Feb 4, 2024
fb4afc6
Update .gitmodules
MakiWolf Feb 4, 2024
d38c522
update
MakiWolf Feb 4, 2024
4cc2286
Update .gitmodules
MakiWolf Feb 4, 2024
a36173f
update
MakiWolf Feb 4, 2024
aae3e64
update
MakiWolf Feb 4, 2024
08edfa9
update
MakiWolf Feb 4, 2024
83427b5
update
MakiWolf Feb 9, 2024
22990e4
update
MakiWolf Feb 9, 2024
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
Prev Previous commit
Next Next commit
update
  • Loading branch information
@MakiWolf
MakiWolf committed Feb 4, 2024
commit d38c522492ffa6ef3b57c907b580a247c486e45f
2 changes: 1 addition & 1 deletion main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<IncludeCopyLocal Include="Mono.Addins.Gui.dll" />
<IncludeCopyLocal Include="Mono.Debugging.dll" />
<IncludeCopyLocal Include="Xwt.dll" />

<IncludeCopyLocal Include="Xwt.Gtk.dll" />
<IncludeCopyLocal Include="YamlDotNet.dll" />
</ItemGroup>
<ItemGroup Condition=" '$(Configuration)' == 'DebugWin32' Or '$(Configuration)' == 'ReleaseWin32' ">
Expand Down
14 changes: 7 additions & 7 deletions main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,20 +159,20 @@ int Run (MonoDevelopOptions options)

// XWT initialization
FilePath p = typeof (IdeStartup).Assembly.Location;
//Runtime.LoadAssemblyFrom (p.ParentDirectory.Combine ("Xwt.Gtk.dll"));
//Xwt.Application.InitializeAsGuest (Xwt.ToolkitType.Gtk);
//Xwt.Toolkit.CurrentEngine.RegisterBackend<IExtendedTitleBarWindowBackend, GtkExtendedTitleBarWindowBackend> ();
//Xwt.Toolkit.CurrentEngine.RegisterBackend<IExtendedTitleBarDialogBackend, GtkExtendedTitleBarDialogBackend> ();
//IdeTheme.SetupXwtTheme ();
Runtime.LoadAssemblyFrom (p.ParentDirectory.Combine ("Xwt.Gtk.dll"));
Xwt.Application.InitializeAsGuest (Xwt.ToolkitType.Gtk);
Xwt.Toolkit.CurrentEngine.RegisterBackend<IExtendedTitleBarWindowBackend, GtkExtendedTitleBarWindowBackend> ();
Xwt.Toolkit.CurrentEngine.RegisterBackend<IExtendedTitleBarDialogBackend, GtkExtendedTitleBarDialogBackend> ();
IdeTheme.SetupXwtTheme ();

IdeStartupTracker.StartupTracker.MarkSection ("XwtInitialization");

//default to Windows IME on Windows
//if (Platform.IsWindows && GtkWorkarounds.GtkMinorVersion >= 16) {
var settings = Gtk.Settings.Default;
// var val = GtkWorkarounds.GetProperty (settings, "gtk-im-module");
var val = GtkWorkarounds.GetProperty (settings, "gtk-im-module");
// if (string.IsNullOrEmpty (val.Val as string))
// GtkWorkarounds.SetProperty (settings, "gtk-im-module", new GLib.Value ("ime"));
GtkWorkarounds.SetProperty (settings, "gtk-im-module", new GLib.Value ("ime"));
//}

DispatchService.Initialize ();
Expand Down