Seth Alves
46a741be7b
Merge pull request #12068 from vladest/move_to_qqc2
...
Move to qqc2
2018-04-12 11:26:55 -07:00
Alexander Ivash
25a44edfce
fix conditional bindings
...
note: unfortunately there is no way to understand whether the item was anchored as even not anchored item has some anchors
2018-04-06 13:22:27 +03:00
Alexander Ivash
9ec10bbb7e
Make keyboard's 'raisedHeight' to include 'mirror text' height
...
note: this is necessary becasue all the dialogs rely on 'raisedHeight', so without 'mirror text' they will use wrong keyboard geometry during calculations
2018-04-06 00:18:19 +03:00
Alexander Ivash
ccea3efe1e
FB13789 - Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password?" links
2018-04-03 21:43:40 +03:00
vladest
096b56395e
Fix crash on startup
2018-03-27 18:22:56 +02:00
vladest
56150f8962
Merge branch 'master' into move_to_qqc2
2018-03-24 15:34:49 +01:00
John Conklin II
c61ed697df
Merge pull request #12552 from vladest/assetbrowser_cosmetics
...
Wrap text in query dialogs. Add right margins for input field and but…
2018-03-22 17:56:47 -07:00
Zach Fox
74e24ec289
Final touches?
2018-03-14 10:58:18 -07:00
Zach Fox
86115a8578
Merge branch 'master' of github.com:highfidelity/hifi into filterBar
2018-03-13 13:42:13 -07:00
Zach Fox
a949208988
Design tweaks
2018-03-13 13:23:32 -07:00
Zach Fox
5563edd957
Focus fix; Switch to QQC2
2018-03-13 13:11:59 -07:00
Zach Fox
50e709c738
Add updates; drop shadow
2018-03-13 12:13:14 -07:00
vladest
d41dd1b18d
Merge branch 'master' into move_to_qqc2
2018-03-13 19:28:51 +01:00
Zach Fox
bce7fb1ff1
Improvements
2018-03-12 16:54:10 -07:00
Zach Fox
9c7d857ecb
Fix some focus issues
2018-03-12 16:15:50 -07:00
Zach Fox
f1121db4da
It's working!
2018-03-12 15:54:11 -07:00
Zach Fox
db7eea543e
Initial progress
2018-03-12 15:11:09 -07:00
John Conklin II
7f7d20738a
Merge pull request #12553 from vladest/mac_combobox_misplaced
...
Fix CheckBox on Mac
2018-03-12 14:47:39 -07:00
vladest
405951e411
Fix merge conflict
2018-03-10 14:45:20 +01:00
vladest
fe5d7463fe
Merge branch 'master' into move_to_qqc2
2018-03-10 14:42:51 +01:00
Zach Fox
d0cc64f63d
Fix font loading for MacOS via different font loading method
2018-03-08 11:19:49 -08:00
Brad Davis
8bfc610cfb
Merge remote-tracking branch 'upstream/master' into android
2018-03-05 11:48:58 -08:00
vladest
43e7f282ec
cleanup
2018-03-04 20:44:46 +01:00
vladest
c2c7962f66
return styling. set implicit sizes
2018-03-04 19:49:47 +01:00
vladest
9f151566bf
temporarily remove styling
2018-03-04 18:46:27 +01:00
vladest
1d43ca48bd
remove wrap
2018-03-04 17:59:56 +01:00
vladest
12a70d57c2
Set Y pos for indicator explicetly
2018-03-04 17:24:52 +01:00
vladest
148faa3a93
Merge branch 'master' into move_to_qqc2
2018-03-04 14:16:21 +01:00
vladest
2a9bbfa808
Wrap text in query dialogs. Add right margins for input field and buttons
2018-03-04 13:19:56 +01:00
Zach Fox
67034274fa
Improve font loading by using QRC instead of relative paths
2018-02-28 17:59:37 -08:00
vladest
6a5fe0d513
Merge branch 'master' into move_to_qqc2
2018-02-27 15:23:52 +01:00
John Conklin II
e586a35d38
Merge pull request #12489 from vladest/fix_table_sort_indicator
...
Make sure sort indicator is attached to the right of title
2018-02-26 10:33:27 -08:00
vladest
62f2ba0dad
More intellectual calculation of title positions taking in account actual sort indicator glyph size
2018-02-24 09:32:08 +01:00
vladest
b1070f85f0
Merge branch 'master' into move_to_qqc2
2018-02-24 02:59:40 +01:00
vladest
b8102cfbd7
Make sure sort indicator is attached to the right of title
2018-02-23 10:06:16 +01:00
Bradley Austin Davis
12d1885dff
Merge pull request #12428 from gcalero/android_ui_fixes
...
Android ui fixes
2018-02-22 18:28:18 -08:00
Zach Fox
2daa30f125
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-20 12:41:12 -08:00
Zach Fox
c4e9c76258
Small UIT tweaks
2018-02-15 16:03:49 -08:00
Zach Fox
8072372822
Lots of changes
2018-02-15 13:27:13 -08:00
Cristian Luis Duarte
674af54a82
Android - Scale up Sign In and Sign Up windows.
2018-02-14 17:02:03 -03:00
vladest
d71448d217
Merge branch 'master' into move_to_qqc2
2018-02-14 20:47:37 +01:00
John Conklin II
6187731fdc
Merge pull request #12291 from 1P-Cusack/FogBugz/Case_10865
...
[Case 10865] Make Asset Browser multi-select work with Ctrl/Cmd/Shift+Click
2018-02-14 11:14:26 -08:00
Cristian Luis Duarte
bb4f57f982
Android - Avatar selection window accessible from the bottom bar. Only hardcoded avatars, no marketplace.
2018-02-09 17:32:12 -03:00
vladest
1c63bcf02e
Merge branch 'master' into move_to_qqc2
2018-01-31 22:13:52 +01:00
Seth Alves
50e6864988
Merge pull request #12138 from Triplelexx/21669_prompt_keyboard
...
WL#21669: Allow better keyboard navigation of prompt windows such as Window.prompt()
2018-01-31 11:19:49 -08:00
LaShonda Hopper
5a771e3a16
[Case 10865] Ctrl/Cmd/Shift+Click Multi-Select for Asset Browser.
...
* Removes manual selectionModel update from controls-uit/Tree.qml
* This was interfering with the Key+Click functionality. It
was introduced via Commit 99617600c4
to address a selection
issue; however, it's unclear what that issue was. Selection
within the Asset Browser works without it at present.
* Amends the ContextMenu within the AssetBrowser to work in conjunction
with the multi-selection changes.
* ContextMenu will _only_ display when triggered within the current
selection be it one or more items as opposed to previous behavior
of selecting the item the menu was triggered on.
* CopyURL is only enabled when the selection size is 1
* Rename is only enabled when the selection size is 1
* Delete is enabled when the selection size is greater than 0
Changes Committed:
modified: interface/resources/qml/controls-uit/Tree.qml
modified: interface/resources/qml/hifi/AssetServer.qml
2018-01-30 14:44:34 -05:00
vladest
b947504849
Merge conflicts
2018-01-22 21:42:32 +01:00
Zach Fox
1dde640a40
-_-
2018-01-19 16:06:01 -08:00
vladest
e7a035f954
Fix indent
2018-01-19 23:01:41 +01:00
vladest
c235deb6f0
Merge branch 'master' into move_to_qqc2
2018-01-19 23:01:04 +01:00