7 Commits

Author SHA1 Message Date
Ghostkeeper
ee9de1f11b
Merge branch '3.2'
Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.
2018-02-14 10:53:51 +01:00
Mark
b531c0550d Change Math.floor to Math.round as a last try to fix garbled fonts
CURA-4941
2018-02-14 09:28:47 +01:00
Jaime van Kessel
77e3965fc7 Added videostream to cluster again
CL-541
2017-12-06 14:59:20 +01:00
Jaime van Kessel
dea13899b3 Cluster can now "target" one of it's printers for display
CL-541
2017-11-30 13:07:01 +01:00
Mark
334283e893 Found some more margins that wouldnt be fixed numbers and made the code more consistent 2017-10-27 14:12:35 +02:00
fieldOfView
1715f0578d Apply screenScaleFactor to Cura Connect UI
Any pixel size specified in QML should not either use UM.Theme.getSize(), or use screenScaleFactor to make sure the pixel size is as intended on OSX, Windows and Linux regardless of display DPI.

Contributes to CURA-4376
2017-09-28 15:42:52 +02:00
Simon Edwards
85efd9249c
Add in all of the changes for Cura Connect
CURA-4376
2017-09-27 10:29:48 +02:00