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.

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

Implementing viewport functionality into ImGui.NET #140

Open
wants to merge 29 commits into
base: viewport
Choose a base branch
from
Open

Implementing viewport functionality into ImGui.NET #140

Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
78b6fd6
Fixed switched mouse input
Jan 3, 2019
571f797
Fix issue with InputText(Multiline) manual overloads which could over…
mellinoe Jan 13, 2019
c4842e4
Bump version to 1.66.1.
mellinoe Jan 13, 2019
7f3739a
Update to 1.67.
mellinoe Jan 15, 2019
0f32fae
fixes a bug with MonoGame and FNA when creating a texture at runtime
prime31 Feb 13, 2019
3a62f6b
update link in csproj file
prime31 Feb 13, 2019
78fe032
cleanup
prime31 Feb 13, 2019
8e3caa1
Fix FNA input for text
prime31 Feb 13, 2019
1743198
Fix native constructor function imports
mellinoe Feb 25, 2019
4588142
Generated PInvokes for "_destroy" functions .
mellinoe Feb 25, 2019
dcb9b89
Add build targets for mono and legacy MSBuild (pre-PackageReference).
mellinoe Mar 13, 2019
4ef0abb
Update to 1.68.
mellinoe Mar 13, 2019
580d552
Merge branch 'mono-build-targets'
mellinoe Mar 13, 2019
34a0848
Update to v1.69.
mellinoe Apr 2, 2019
489f847
Update to v1.70.
amerkoleci May 8, 2019
448f22d
Handle new default value in the code generator.
mellinoe May 9, 2019
8e34c98
Download 1.70 binaries.
mellinoe May 9, 2019
88ca3dc
Update to last 1.71
amerkoleci Jun 17, 2019
cd5c026
Add support for parameters having variant types as defined in variant…
giawa Jun 18, 2019
5afed42
Add example variants.json that adds IntPtr* as a parameter variant fo…
giawa Jun 18, 2019
8be7644
Modify SampleProgram to use 'safe' version of GetTexDataAsRGBA32, whi…
giawa Jun 18, 2019
d62cb5f
Process the variants into a dictionary and then mark them as used as …
giawa Jun 18, 2019
84ec6ed
Update native binaries to 1.71.
mellinoe Jul 17, 2019
88836f5
Merge remote-tracking branch 'giawa/feature/type-variants-sep-json' i…
mellinoe Jul 17, 2019
5e9d6be
Misc project cleanup
mellinoe Jul 17, 2019
35aabdc
Bump to 1.72b (NuGet version 1.72.0).
mellinoe Sep 22, 2019
96e786d
docking branch version of dear imgui using cimgui
Sep 30, 2019
dea364d
implement viewport functionality
Oct 18, 2019
5b7352c
minor cleanup
Oct 18, 2019
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
Fix issue with InputText(Multiline) manual overloads which could over… 
…flow their native buffers.
  • Loading branch information
@mellinoe
mellinoe committed Jan 13, 2019
commit 571f7975cdf02e448381290dd5d270cb576d3192
4 changes: 2 additions & 2 deletions src/ImGui.NET/ImGui.Manual.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public static bool InputText(
}
Util.GetUtf8(input, utf8InputBytes, inputBufSize);
uint clearBytesCount = (uint)(inputBufSize - utf8InputByteCount);
Unsafe.InitBlockUnaligned(utf8InputBytes + utf8InputByteCount + 1, 0, clearBytesCount);
Unsafe.InitBlockUnaligned(utf8InputBytes + utf8InputByteCount, 0, clearBytesCount);
Unsafe.CopyBlock(originalUtf8InputBytes, utf8InputBytes, (uint)inputBufSize);

byte result = ImGuiNative.igInputText(
Expand Down Expand Up @@ -218,7 +218,7 @@ public static bool InputTextMultiline(
}
Util.GetUtf8(input, utf8InputBytes, inputBufSize);
uint clearBytesCount = (uint)(inputBufSize - utf8InputByteCount);
Unsafe.InitBlockUnaligned(utf8InputBytes + utf8InputByteCount + 1, 0, clearBytesCount);
Unsafe.InitBlockUnaligned(utf8InputBytes + utf8InputByteCount, 0, clearBytesCount);
Unsafe.CopyBlock(originalUtf8InputBytes, utf8InputBytes, (uint)inputBufSize);

byte result = ImGuiNative.igInputTextMultiline(
Expand Down