ocornut
|
f34d7ea199
|
Fixed bad merge
|
2016-07-29 11:23:04 +02:00 |
|
ocornut
|
5f6f4d0ffc
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
2016-07-29 11:17:13 +02:00 |
|
ocornut
|
4a4d3eab70
|
Merge branch 'michaelbartnett-add-osx-homeend-keys'
|
2016-07-29 11:06:27 +02:00 |
|
ocornut
|
7086a17854
|
InputTextEx: got rid of unnecessary locals.
|
2016-07-29 11:06:16 +02:00 |
|
ocornut
|
776ea6b946
|
InputTextEx(): more shallow tidying up, still being cautious with this function
|
2016-07-29 11:01:06 +02:00 |
|
ocornut
|
666d83b5c7
|
InputText/IO: Got rid of individual OSX options in ImGuiIO, added io.OSXBehaviors (#473, #650)
|
2016-07-29 10:56:47 +02:00 |
|
ocornut
|
0ff22dbf0b
|
InputTextEx(): minor tidying up
|
2016-07-29 10:51:35 +02:00 |
|
ocornut
|
e5b6ddde26
|
InputText(): minor tidying up/simplification following changes for osx style improvements (#650)
|
2016-07-29 10:42:08 +02:00 |
|
ocornut
|
802e91f69e
|
Merge branch 'add-osx-homeend-keys' of https://github.com/michaelbartnett/imgui into michaelbartnett-add-osx-homeend-keys
|
2016-07-29 10:34:01 +02:00 |
|
ocornut
|
d8dacd729b
|
Examples: SDL+OpenGL: explicitly setting GL_UNPACK_ROW_LENGTH to reduce issues because SDL changes it (#752)
|
2016-07-29 10:10:41 +02:00 |
|
ocornut
|
aeabda5a5f
|
Navigation: Tap NavMenu to access menu and close buttons, hold to focus/resize (#323)
Introducing a concept of NavLayer to filter navigable items
|
2016-07-24 14:56:14 +02:00 |
|
ocornut
|
c3aa36d9ab
|
Navigation: Renamed ImGuiKey_NavWindowing to ImGuiKey_NavMenu (#323)
|
2016-07-24 14:49:16 +02:00 |
|
ocornut
|
175f42420c
|
Navigation: Can nav-out but not nav-in a window with ImGuiWindowFlags_NoNav flag (#323)
|
2016-07-24 14:41:27 +02:00 |
|
ocornut
|
67feb5ac6c
|
Navigation: comments + moving init block of code above in NavUpdate(), should have no side-effect (committed to simplify next commit) (#323)
|
2016-07-24 14:15:34 +02:00 |
|
ocornut
|
a424d6f805
|
Navigation: Fixed missing initialization (had no side-effect, would be set in Begin) (#323)
|
2016-07-24 14:08:50 +02:00 |
|
ocornut
|
49ec65b1b5
|
Navigation: can't manually focus out of a modal window with controller (#323)
|
2016-07-24 14:00:29 +02:00 |
|
ocornut
|
5cac4926c8
|
Fixed display of TitleBgActive color on window before a Modal window + modal window availability for navigation (#323)
|
2016-07-24 13:56:31 +02:00 |
|
ocornut
|
ba43310df1
|
Navigation: Renaming, shortened some unnecessary long fields names (#323)
|
2016-07-24 12:46:25 +02:00 |
|
ocornut
|
4bbdaa4e3c
|
Navigation: Moving NavInitWindow() around and making it static (#323)
|
2016-07-24 11:56:36 +02:00 |
|
ocornut
|
b2ad33ce41
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
2016-07-23 20:33:25 +02:00 |
|
ocornut
|
e9d8b48a4c
|
Navigation: Allow to navigate out of text input with direction or NavCancel (#323)
|
2016-07-23 20:30:44 +02:00 |
|
ocornut
|
2f94563564
|
Navigation: Collapsed window uses ImGuiCol_TitleBgActive when navigation is active (#323)
|
2016-07-23 20:09:41 +02:00 |
|
ocornut
|
afadc7cf59
|
Navigation: Scoring: Improved directional navigation. Not totally cancelling out dx. Better support for zero-spaced items. (#323)
|
2016-07-23 20:05:17 +02:00 |
|
ocornut
|
e74d96642f
|
Navigation: mouse/popup position gets clamped within visible display (#323)
|
2016-07-23 19:42:19 +02:00 |
|
ocornut
|
0cc20fca83
|
Navigation: Scoring uses rectangle as clipped by parent. Fix selectable extending past parent column among other things (#323)
|
2016-07-23 19:24:56 +02:00 |
|
ocornut
|
2f1fb41579
|
Navigation: Fixed automatic fallback scrolling from glitching near scroll limits because of miscalculation of SizeContents (#323)
|
2016-07-23 16:31:23 +02:00 |
|
ocornut
|
ad48309047
|
Navigation: Fixed using NavWindowed when a menu is open. (#323)
|
2016-07-23 16:01:27 +02:00 |
|
ocornut
|
2cab404a81
|
Fixed tooltip positioning issues when using navigation (#323)
|
2016-07-23 15:44:56 +02:00 |
|
ocornut
|
bccd3d8a32
|
Merge branch 'nProtect-master'
|
2016-07-20 11:39:53 +02:00 |
|
ocornut
|
8efd05a148
|
Tab->Spaces, missing spaces, typos
|
2016-07-20 11:39:38 +02:00 |
|
Adisorn Aeksatean
|
4141144b21
|
Added GetGlyphRangesThai()
|
2016-07-20 11:37:08 +02:00 |
|
ocornut
|
c2cb2a6928
|
Gamepad/Keyboard navigation support, initial commit, WIP (#323)
|
2016-07-20 00:02:59 +02:00 |
|
ocornut
|
4a11cc35b9
|
Updated code for repeat delay / repeat handling. GetKeyPressedAmount() now returns a count to support fast repeat rate (where DeltaTime > RepeatRate).
Renamed from recently added IsKeyPressed() variant to GetKeyPressedAmount(). (no API breakage, added in branch, bbd3b75609) (#323)
|
2016-07-19 21:26:36 +02:00 |
|
ocornut
|
88c1966629
|
Added IsAnyWindowFocused(). Renamed IsMouseHoveringAnyWindow() -> IsAnyWindowHovered(), IsPosHoveringAnyWindow() -> IsAnyWindowHoveredAtPos(), IsMouseHoveringWindow() -> IsWindowHoveredRect() for consistency. Kept inline rediection function.
|
2016-07-18 18:24:23 +02:00 |
|
ocornut
|
23a81027e8
|
Comment on invalid comment regarding preserving keyboard focus of a closed window, due to commit 19d02becef. This is probably still what we want. (followup #727)
|
2016-07-18 18:22:11 +02:00 |
|
ocornut
|
eb405ab375
|
DragBehavior: Moving code around, in what should be a no-op, to simplify upcoming Nav diff (#323, #180)
|
2016-07-18 18:22:10 +02:00 |
|
ocornut
|
c816e6c742
|
Fixed SetScrollX() handling of center ratio (which actually wasn't exposed publicly). (#323, #246)
|
2016-07-18 18:22:09 +02:00 |
|
ocornut
|
e10ecfe28a
|
BeginChild(): tweak to make the code easier to understand
|
2016-07-18 18:22:08 +02:00 |
|
ocornut
|
24f79b91bd
|
Style: minor tweak to default color theme to make currently focused window more prominent (#323, #707)
|
2016-07-18 18:22:07 +02:00 |
|
ocornut
|
e72e3b2cbc
|
Demo: tweaks.
|
2016-07-18 18:22:06 +02:00 |
|
ocornut
|
0300e73b3f
|
Comments
|
2016-07-18 15:26:07 +02:00 |
|
ocornut
|
2df229d002
|
Fixed incorrect comment for ParentWindow (#615, #604)
|
2016-07-18 15:26:06 +02:00 |
|
ocornut
|
068984691e
|
Tab-key focusing inhibited when CTRL is held (#323)
|
2016-07-18 15:26:05 +02:00 |
|
ocornut
|
267e54cf06
|
NewFrame(): update activeid data and keyboard before mouse. Should have no side-effects! (So that later we can update Nav between Keyboard and Mouse) (#323)
|
2016-07-18 15:26:04 +02:00 |
|
ocornut
|
272745bd93
|
ImGuiIO: initializing fields in the same order as the declaration.
|
2016-07-18 15:26:03 +02:00 |
|
ocornut
|
848e62bfe0
|
InputText: don't process keys during the activation frame (this is mostly a workaround to that activation with enter doesn't validate immediately, which is turns triggers an assert in InputScalarAsWidgetReplacement - can't see an issue with changing it this way so trying out) + using local flag clear_active_id to only clear the active id at the end of the frame, which is one of the step that my stash for #701 requires. (#323)
|
2016-07-18 15:26:02 +02:00 |
|
ocornut
|
57841f417d
|
SliderBehavior, RoundScalar: split into separate functions for usage in upcoming nav commits. Testing power==1.0f without fabsf(). Maybe just use == 1.0f as well? (#323)
|
2016-07-18 15:26:01 +02:00 |
|
ocornut
|
6f7da2f9f2
|
Popup: Fixed popup initial frame reading MousePos again instead of the value already stored within the CurrentPopupStack in the previous frame. Doesn't make a big difference here, but will do as gamepad/keyboard navigation will set its own popup position. (#323)
|
2016-07-18 15:26:01 +02:00 |
|
ocornut
|
91e1c56da6
|
Minor bits.
|
2016-07-18 15:25:59 +02:00 |
|
ocornut
|
bbd3b75609
|
Added IsKeyPressed() with explicit repeat delay and repeat rate (for usage by nav) (#323)
|
2016-07-18 15:25:58 +02:00 |
|