Commit graph

34 commits

Author SHA1 Message Date
amer cerkic
85fa510d38 addressing comment 2019-07-29 10:28:31 -07:00
amer cerkic
b3ea9d0de7 addressing commetn 2019-07-29 09:40:58 -07:00
amer cerkic
854f89cace addressing comment 2019-07-29 09:39:31 -07:00
amer cerkic
de0b038ee1 trunked to a lambda for simplicity 2019-07-26 13:52:38 -07:00
amer cerkic
087b19d64d removed extra space 2019-07-26 13:15:01 -07:00
amer cerkic
b2e07fd990 changing raw pointer to unique pointer with custom deleter 2019-07-26 13:02:59 -07:00
Ryan Huffman
9872c1c2f7 Add missing emit inside of 2019-07-25 13:55:44 -07:00
amer cerkic
db945851ac fixed merge conflict 2019-07-24 16:03:23 -07:00
amer cerkic
3315271493 reverting commit: 2019-07-24 15:43:31 -07:00
amer cerkic
bea31237b7 addressing comments 2019-07-24 14:30:43 -07:00
Ryan Huffman
c4b63ed5e4 Fix qmlToScript getting called on script thread and causing crash 2019-07-24 13:44:20 -07:00
amer cerkic
f94b082946 addressing comment 2019-07-24 11:47:10 -07:00
amer cerkic
ac17493a40 removing comments 2019-07-24 11:37:38 -07:00
amer cerkic
8c022b025d implementing Dante's change to connect the slots 2019-07-24 11:19:32 -07:00
amer cerkic
ddc678bbc0 added interactivewindow proxy. moved event bridge binding to the proxy instead 2019-07-23 16:57:53 -07:00
dante ruiz
e896a53113 fix interactive crash 2019-07-15 17:18:38 -07:00
dante ruiz
d78661a47f redo requested work 2019-07-12 13:34:08 -07:00
Dante Ruiz
2f74f8253f finishing requested changes 2019-07-11 15:39:59 -07:00
dante ruiz
c4a0b39068 requested changes 2019-07-10 17:56:54 -07:00
dante ruiz
7c024b4e8a fix interactive window crash 2019-07-10 11:49:36 -07:00
Zach Fox
d622e53458 Some comments; changed the code to be backwards compatible 2019-07-08 17:10:11 -07:00
Zach Fox
5048b8bd89 Implement DEV-218 & DEV-219 and commit a starting point for the Emote app 2019-07-08 16:46:58 -07:00
Zach Fox
9a926abd76 Implement BUGZ-226: Forward keypresses made while Top Bar is in focus 2019-06-10 20:27:03 -07:00
Zach Fox
a7ad087bd0 Fix BUGZ-201: Prevent MUTED banner from being cut off when muted on startup 2019-06-06 14:23:18 -07:00
amerhifi
5a3585ea5b adressing pr comments 2019-05-24 14:36:42 -07:00
amerhifi
6f04e039fe adding whitelisting for dockedWidgets 2019-05-24 14:12:24 -07:00
amerhifi
bd88a68a0f testing context passing to dockWidget via whitelisting. 2019-05-24 10:58:13 -07:00
Zach Fox
ee9d3d3ae1
Merge pull request #15567 from zfox23/dockedWindowEventBridge
Fix JS to QML event bridge messages with Docked Windows
2019-05-15 16:28:43 -07:00
Zach Fox
0400bc6da0 Fix JS to QML event bridge messages with Docked Windows 2019-05-15 15:36:28 -07:00
David Rowe
997dc963d3 Merge branch 'master' into M22147 2019-05-15 07:59:10 +12:00
danteruiz
0fae615cb4 fix dock widget context 2019-05-09 09:20:50 -07:00
David Rowe
302e876857 Update InteractiveWindow JSDoc per changes in master 2019-05-09 10:26:16 +12:00
David Rowe
414f27208d Merge branch 'master' into M22147
# Conflicts:
#	interface/src/scripting/DesktopScriptingInterface.h
#	interface/src/ui/InteractiveWindow.h
2019-05-09 08:43:05 +12:00
danteruiz
3806631bf1 dockable window 2019-05-08 10:04:31 -07:00
Renamed from libraries/ui/src/InteractiveWindow.cpp (Browse further)