History

adjusting the qml again ? i just hate the layout / anchor system

Sam Gateau committed 9 years ago

Commit a2765cf1 parent 1dbeac71 file · +25 −28Browse files

Showing the changes to scripts/developer (1 of 1 file). Show all

Unified · Split

scripts/developer/utilities/render/deferredLighting.qml+25−28
@@ -21,39 +21,25 @@ Rectangle { · 20 unmodified lines
2121 anchors.margins: hifi.dimensions.contentMargin.x
2222
2323 color: hifi.colors.baseGray;
24− property var mainViewTask: Render.getConfig("RenderMainView")
24+ property var mainViewTask: Render.getConfig("RenderMainView")
2525
26− Row {
27− anchors.left: parent.left
28− anchors.right: parent.right
29− anchors.margins: 10
3026 Column {
31− padding: 10
3227 spacing: 5
33−
34− // width: parent.width
3528 anchors.left: parent.left
3629 anchors.right: parent.right
37− // padding: hifi.dimensions.contentMargin.x
38−
39− ConfigSlider {
40− label: qsTr("ToneMapping")
41− integral: false
42− config: render.mainViewTask.getConfig("ToneMapping")
43− property: "exposure"
44− max: 2
45− min: 0
46−
47− anchors.left: parent.left
48− anchors.right: parent.right
30+ anchors.margins: hifi.dimensions.contentMargin.x
31+ //padding: hifi.dimensions.contentMargin.x
32+ HifiControls.Label {
33+ text: "Shading"
4934 }
50−
5135 Row {
52−
36+ anchors.left: parent.left
37+ anchors.right: parent.right
38+
5339 spacing: 20
54− padding: 10
5540 Column {
5641 spacing: 10
42+ // padding: 10
5743 Repeater {
5844 model: [
5945 "Unlit:LightingModel:enableUnlit",
@@ -116,6 +102,8 @@ Rectangle { · 56 unmodified lines
116102 }
117103 Separator {}
118104 Column {
105+ anchors.left: parent.left
106+ anchors.right: parent.right
119107 spacing: 10
120108 Repeater {
121109 model: [ "Tone Mapping Exposure:ToneMapping:exposure:5.0:-5.0"
@@ -127,17 +115,22 @@ Rectangle { · 5 unmodified lines
127115 property: modelData.split(":")[2]
128116 max: modelData.split(":")[3]
129117 min: modelData.split(":")[4]
118+
119+ anchors.left: parent.left
120+ anchors.right: parent.right
130121 }
131122 }
132123
133124 Row {
125+ anchors.left: parent.left
126+ anchors.right: parent.right
134127 HifiControls.Label {
135128 text: "Tone Mapping Curve"
136− anchors.left: root.left
129+ // anchors.left: parent.left
137130 }
138131
139132 HifiControls.ComboBox {
140− anchors.right: root.right
133+ // anchors.right: parent.right
141134 currentIndex: 1
142135 model: ListModel {
143136 id: cbItems
@@ -151,7 +144,11 @@ Rectangle { · 7 unmodified lines
151144 }
152145 }
153146 }
147+ Separator {}
148+
154149 Row {
150+ anchors.left: parent.left
151+ anchors.right: parent.right
155152 id: framebuffer
156153 spacing: 10
157154 height: 24
@@ -159,7 +156,7 @@ Rectangle { · 1 unmodified line
159156 HifiControls.Label {
160157 text: "Debug Framebuffer"
161158 height: 24
162− anchors.left: root.left
159+ // anchors.left: parent.left
163160 }
164161
165162 property var config: render.mainViewTask.getConfig("DebugDeferredBuffer")
@@ -171,7 +168,7 @@ Rectangle { · 5 unmodified lines
171168
172169 HifiControls.ComboBox {
173170 height: 24
174− anchors.right: root.right
171+ // anchors.right: parent.right
175172 currentIndex: 0
176173 model: ListModel {
177174 id: cbItemsFramebuffer
@@ -273,5 +270,5 @@ Rectangle { · 95 unmodified lines
273270 }
274271 }
275272 }
276− }
273+ //}
277274 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t