Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-20 23:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	docs/CHANGELOG.txt
This commit is contained in:
omar 2019-02-19 13:04:35 +01:00
commit 9dc02464a4
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/CHANGELOG.txt
View File

@ -94,7 +94,7 @@ Other changes:
-----------------------------------------------------------------------
VERSION 1.68 (In progress)
VERSION 1.68 (Released 2019-02-19)
-----------------------------------------------------------------------
Breaking Changes:
@ -111,12 +111,12 @@ Other Changes:
multi-viewport feature to behave on Retina display and with multiple displays.
If you are not using a custom binding, please update your render function code ahead of time,
and use draw_data->FramebufferScale instead of io.DisplayFramebufferScale. (#2306, #1676)
- Added IsItemActivated() as an extension to the IsItemDeactivated/IsItemDeactivatedAfterEdit functions
which are useful to implement variety of undo patterns. (#820, #956, #1875)
- InputText: Fixed a bug where ESCAPE would not restore the initial value in all situations. (#2321) [@relick]
- InputText: Fixed a bug where ESCAPE would be first captured by the Keyboard Navigation code. (#2321, #787)
- InputText: Fixed redo buffer exhaustion handling (rare) which could corrupt the undo character buffer. (#2333)
The way the redo/undo buffers work would have made it generally unnoticeable to the user.
- Added IsItemActivated() as an extension to the IsItemDeactivated/IsItemDeactivatedAfterEdit functions
which are useful to implement variety of undo patterns. (#820, #956, #1875)
- Fixed range-version of PushID() and GetID() not honoring the ### operator to restart from the seed value.
- Fixed CloseCurrentPopup() on a child-menu of a modal incorrectly closing the modal. (#2308)
- Tabs: Added ImGuiTabBarFlags_TabListPopupButton flag to show a popup button on manual tab bars. (#261, #351)

2
imgui.cpp
View File

@ -1,4 +1,4 @@
// dear imgui, v1.68 WIP
// dear imgui, v1.68
// (main code and documentation)
// Call and read ImGui::ShowDemoWindow() in imgui_demo.cpp for demo code.

6
imgui.h
View File

@ -1,4 +1,4 @@
// dear imgui, v1.68 WIP
// dear imgui, v1.68
// (headers)
// See imgui.cpp file for documentation.
@ -46,8 +46,8 @@ Index of this file:
// Version
// (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY00 then bounced up to XYY01 when release tagging happens)
#define IMGUI_VERSION "1.68 WIP"
#define IMGUI_VERSION_NUM 16800
#define IMGUI_VERSION "1.68"
#define IMGUI_VERSION_NUM 16801
#define IMGUI_CHECKVERSION() ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert))
#define IMGUI_HAS_VIEWPORT 1 // Viewport WIP branch
#define IMGUI_HAS_DOCK 1 // Docking WIP branch

2
imgui_demo.cpp
View File

@ -1,4 +1,4 @@
// dear imgui, v1.68 WIP
// dear imgui, v1.68
// (demo code)
// Message to the person tempted to delete this file when integrating Dear ImGui into their code base:

2
imgui_draw.cpp
View File

@ -1,4 +1,4 @@
// dear imgui, v1.68 WIP
// dear imgui, v1.68
// (drawing and font code)
/*

2
imgui_internal.h
View File

@ -1,4 +1,4 @@
// dear imgui, v1.68 WIP
// dear imgui, v1.68
// (internal structures/api)
// You may use this file to debug, understand or extend ImGui features but we don't provide any guarantee of forward compatibility!

2
imgui_widgets.cpp
View File

@ -1,4 +1,4 @@
// dear imgui, v1.68 WIP
// dear imgui, v1.68
// (widgets code)
/*