Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-17 14:40:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
64749 commits 72 branches 59 tags 1.2 GiB
Commit graph

331 commits

Author SHA1 Message Date
vladest
b1070f85f0 Merge branch 'master' into move_to_qqc2 2018-02-24 02:59:40 +01: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
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
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
Triplelexx
f1147948cb add focused color to GlyphButton 2018-01-19 12:28:27 +00:00
Triplelexx
44740d5716 add sound on button focus changed 
Feels more consistent with hovering
 2018-01-19 12:27:49 +00:00
Triplelexx
e69fdba6ad add padding to sorting glyph 
the file dialog sorting glyphs are clipping on the right margin for me, adding 10 extra pixels fixes it
 2018-01-19 12:18:29 +00:00
Zach Fox
c6429f4f33 Path towards pixel perfection 2018-01-18 17:05:36 -08:00
Triplelexx
cede8ed597 add focused color 
keyboard navigation uses focusedColor
 2018-01-18 19:56:55 +00:00
Zach Fox
d25ef074e1 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-11 12:35:18 -08:00
vladest
b5f3631c21 Merge branch 'master' into move_to_qqc2 2018-01-11 18:54:40 +01:00
Zach Fox
22631065e4 Serious flow state 2018-01-10 15:09:15 -08:00
Triplelexx
24f1fc3546 fix Ui keyboard navigation 
various fixes to allow some support for keyboard navigation in message boxes and dialogs
 2018-01-10 22:30:43 +00:00
SamGondelman
c46531296f move key logic from onClicked to onReleased 2018-01-09 18:28:54 -08:00
vladest
09c3f93c74 Switch moved 2017-12-31 15:17:44 +01:00
vladest
c953251cfe TextField moved. Fixed sound on hovering check box 2017-12-30 19:55:52 +01:00
vladest
f5f19ea67f Move RadioButton 2017-12-28 15:53:16 +01:00
vladest
2fbd0a41b1 Move Slider 2017-12-28 15:39:22 +01:00
vladest
5877eeea0b cleanup 2017-12-19 21:35:11 +01:00
vladest
1cf82b7725 SpinBox now works 2017-12-19 21:28:28 +01:00
Zach Fox
b2bafed2bb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-07 11:21:24 -08:00
vladest
b52163cb24 Intitial SpinBox port 2017-12-04 20:54:35 +01:00
vladest
3e118c58a1 Moved RadiButton and Slider 2017-12-04 12:51:57 +01:00
vladest
0f4329be69 Added keyboard support. Cleanup 2017-12-03 22:45:57 +01:00
vladest
f2d7e2f607 Merge branch 'master' into move_to_qqc2 2017-12-02 22:41:19 +01:00
vladest
dfeefe53b8 Make scroll bar handle centered on shaft. Width chaned on par with entities list html view 2017-11-30 11:40:02 +01:00
vladest
ac7a5ebc94 ComboBox: fix closing popup. Started to implement keyboard support 2017-11-30 10:39:01 +01:00
vladest
7283f0127b return back square background for scroll bars 2017-11-28 22:21:52 +01:00
vladest
94937374c5 Make selection not visible under rounded scrollbar 2017-11-28 21:33:13 +01:00
vladest
80eb203008 More precise handle placing. some logging added 2017-11-28 20:20:58 +01:00
vladest
da5090fd49 Implemented more close to QQC2 ideology 2017-11-27 19:43:17 +01:00
vladest
3f0de940a4 Merge branch 'master' into move_to_qqc2 2017-11-26 10:18:44 +01:00
vladest
6136a4cea6 Rounded background 2017-11-25 10:03:56 +01:00
vladest
73a557a8a4 Added Scroll Bar for Trees. Fixed some anchoring issues. Fixed headerless views 2017-11-24 15:58:27 +01:00
vladest
b69b580a68 Use ScrollBar from QQC2 which is supports both mouse and touch events 2017-11-23 23:08:43 +01:00
vladest
4e38b3bace Started working on ComboBox. Add background for scroll bar 2017-11-20 20:35:41 +01:00
Dante Ruiz
76935c1457 fixing merge conflict 2017-11-20 09:51:10 -08:00
vladest
50ed9e2b2a Port CheckBox to QQC2 2017-11-19 22:03:38 +01:00
vladest
6b640bd028 Resolve merge conflicts 2017-11-19 20:52:39 +01:00
Brad Hefta-Gaub
ff8ca6da4c
Merge pull request #11303 from vladest/webbrowser_updates 
Webbrowser updates
 2017-11-19 11:11:09 -08:00
vladest
cfacf3b47d Port web glyph button to QQC2 2017-11-16 21:58:09 +01:00