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

Jump to bottom

Fruxo upstream merge #6

Closed
wants to merge 28 commits into from
Closed

Fruxo upstream merge #6

wants to merge 28 commits into from

Conversation

Zomtir
Copy link

@Zomtir Zomtir commented Mar 28, 2019

This is a full merge of current fruxo/master.

The multi touch API and code has changed, here's a list of what has been taken from each branch:

  • Turbodager: Invoke and event syntax (e.g EVENT_TYPE_TOUCH_* rather than EVENT_TYPE_FINGER )
  • Turbodager: Finger ID handling
  • Hastybadger: Touch Gesture (aka MultiGesture)
  • Hastybadger: Triggering Pointer and Touch events at the same time on touch (with touch boolean) rather than forwarding from Touch->Pointer for a single finger.

Each commit has been tested with "make sdl2" and an execution of the demo.

@Zomtir Zomtir changed the title Unity Fruxo upstream merge Apr 4, 2019
@Zomtir
Copy link
Author

Zomtir commented Apr 4, 2019

The touch API is not yet suited for touchpads because their movement cannot be mapped 1:1 onto the screen. I will have to change it to make touch input independent from the pointer location again.

@Zomtir Zomtir force-pushed the unity branch 2 times, most recently from 243ed00 to ba30f59 Compare April 8, 2019 14:09
codecat and others added 26 commits April 8, 2019 17:23
@codecat @Zomtir
Fix TBImage::IsEmpty
1678be1
@fruxo @Zomtir
Removed block from element, introduced packed union
997991f 
Conflicts:
	src/tb/tb_editfield.cpp
	src/tb/tb_style_edit.cpp
	src/tb/tb_style_edit.h
	src/tb/tb_style_edit_content.cpp
	src/tb/tb_style_edit_content.h
@fruxo @Zomtir
Reuse TBTextProps instead of constantly reallocating.
b507baa 
Conflicts:
	src/tb/tb_style_edit.cpp
@fruxo @Zomtir
Added a few more characters as word breakers.
bfa6064 
These: @$'~|?
@fruxo @Zomtir
Moved paint related arguments into TBPaintProps.
6c5a43b 
Conflicts:
	src/tb/tb_style_edit.cpp
	src/tb/tb_style_edit.h
	src/tb/tb_style_edit_content.cpp
	src/tb/tb_style_edit_content.h
@fruxo @Zomtir
Added TBSyntaxHighlighter.
e0d0743 
Conflicts:
	src/tb/tb_style_edit.h
@mgerhardy @Zomtir
fixed compiler warnings
1bacb3f
@mgerhardy @Zomtir
TBWindow should have a virtual destructor
f1bd0c7 
fixed compiler warnings
@mgerhardy @Zomtir
support text-align for TBEditField
232c3f6 
Conflicts:
	src/tb/tb_widgets_reader.cpp
@mgerhardy @Zomtir
added text-align to tb_widgets_attr.tb.txt
9da410e
@mgerhardy @Zomtir
added missing const qualifiers
ca89b1a
@mgerhardy @Zomtir
use nullptr
663a6db 
Conflicts:
	Demo/platform/port_glfw.cpp
@fruxo @Zomtir
Added some unit tests & fixed bug in TBHashTable.
13a3f8a 
Added missing GetNumItems and decrement count
when items are removed.

Conflicts:
	src/tb/tb_hashtable.h
@fruxo @Zomtir
API for multi touch.
df39ce3 
Opt-in support for multi touch. Widgets will still only respond to
pointer/first touch events, but new API makes it possible to implement
multi touch widgets (such as action buttons, pan/zoom containers etc).

Conflicts:
	src/tb/tb_widgets.h
@Zomtir
Merging MultiGesture with fruxo touch code
0828da2
@Zomtir
Multi-touch merge adaptions
ff533f4
@mgerhardy @Zomtir
Fixed warning about missing virtual dtor
9399c6c 
Conflicts:
	src/tb/tb_widgets_reader.h
@mgerhardy @Zomtir
Fixed warnings about missing override
a3dbfc1 
Not sure about c++11 policy... but fixing this would be cool, it fills all my compile logs.
@mgerhardy @Zomtir
extended TBImageManager to be able to load images from memory
6b3d033 
Conflicts:
	image/tb_image_manager.h
	image/tb_image_manager.cpp
@mgerhardy @Zomtir
Added boolean return value to ReadData
9d8d96c 
this allows application to test parsing before replacing existing ui
@codecat @Zomtir
Add tb:: prefix for making widgets outside of tb namespace
6f290b3 
Conflicts:
	src/tb/tb_widgets_reader.h
@fruxo @Zomtir
Minor optimization in GetGlyph.
3dcebc7 
Don't call GetHashId twice.
@fruxo @Zomtir
Cache size in TBWidgetString.
b391c62 
Avoid remeasuring strings during painting.

Conflicts:
	src/tb/tb_widgets_common.cpp
	src/tb/tb_widgets_common.h
@fruxo @Zomtir
Cache width in TBTextFragment.
7ca8072 
Makes painting faster when text is selected or styled.

Will also make Reformat(false) faster (f.ex resizing a text field).

Conflicts:
	src/tb/tb_style_edit.h
	src/tb/tb_style_edit.cpp
@fruxo @Zomtir
Added follow_ref to CloneChildren.
6f09144
@fruxo @Zomtir
Added TBValue::IsNull
b855864
@fruxo @Zomtir
Added TBColor Premultiply & Unpremultiply.
afbb204 
Conflicts:
	src/tb/tb_color.h
@fruxo @Zomtir
Added float dimension conversions and slightly changed calculations.
b40b258 
Round integer conversions and removed nonzero guarantee for values
that where not zero before conversion.

Unknown/mistyped unit is treated like dp instead of px.

Conflicts:
	src/tb/tb_dimension.cpp
	src/tb/tb_dimension.h
@Xeverous
Copy link

Just a note: this repo has not enabled issues. It's virtually impossible to propose anything to the repo while the readme encourages doing so.

Commenting here (most recent PR) ... because I can not open an issue.

@tesch1
Copy link
Owner

tesch1 commented Jul 22, 2019

Thanks for the note, they're enabled now.

@tesch1
Copy link
Owner

tesch1 commented Jul 22, 2019

A note for outside observers - this PR is in limbo -- it contains a lot of changes and it's hard to test them all. I see a few different things going on here 1) merging the fruxo/turbobadger mainline, 2) switching to a different(new) multi-touch / gesture model, 3) ?

I haven't had time to review all of these things, and some of them are changes to APIs that are in use elsewhere, so I wouldn't count on this being merged as-is.

@Zomtir
Copy link
Author

Zomtir commented Jul 22, 2019 •
edited

  1. switching to a different(new) multi-touch / gesture model

I'm trying so summarize the changes in ff533f4 and 0828da2

There were five trivial changes:

  • FINGER_DOWN was renamed to TOUCH_DOWN (leaning on the upstream syntax by fruxo)
  • Integer type change from uint32 to uint32_t
  • Moved the InvokeWheel function
  • Renamed NewTouchInfo to AddTouchInfo (this function is only used privately)
  • Make use of IsTouchEvent() rather than testing for the cases individually
  • Eearlier bails (returns false) for missing widgets. They no longer reach the end of the function and use less indention.

The remaining changes boil down to those three:

  • The attributes from TBWidgetEventFinger were merged into TBWidgetEvent. The vast majority already had a corresponding counterpart. The only complete new attributes added to TBWidgetEvent were delta_theta and delta_dist.
  • The constructors from TBWidgetEventFinger were added to TBWidgetEvent
  • Renamed InvokeFingerMotion to InvokeTouchGesture. The only difference in the body consits of the TBWidgetEvent trigger rather than the superseded TBWidgetEventFinger.

All in all it's a very lightweight addition of a InvokeTouchGesture() method compared to the fruxo master branch.

  1. ?

There were no additional changes beside the two commits mentioned above. All other commits (authored on fruxo master) can be compiled by their own and have only be minorly adapted to the current code base (~90% uint32 to uint32_t).

I hope this helps for the review.

@tesch1 tesch1 closed this Oct 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@Zomtir @Xeverous @tesch1 @codecat @fruxo @mgerhardy