@@ -73,6 +73,7 @@ void CustomLayoutDialog::showEvent(QShowEvent*)
7373 connect (ui->mainCols , SIGNAL (valueChanged (int )), this , SLOT (renderPreview ()));
7474 connect (ui->mainRows , SIGNAL (valueChanged (int )), this , SLOT (renderPreview ()));
7575 connect (ui->borderEnabled , SIGNAL (toggled (bool )), this , SLOT (renderPreview ()));
76+ connect (ui->borderScreenEnabled , SIGNAL (toggled (bool )), this , SLOT (renderPreview ()));
7677 connect (ui->borderWidth , SIGNAL (valueChanged (int )), this , SLOT (renderPreview ()));
7778 connect (ui->borderColor , SIGNAL (colorChanged (QColor)), this , SLOT (renderPreview ()));
7879
@@ -109,11 +110,13 @@ void CustomLayoutDialog::setCustLayout(const CustomLayout &_layout)
109110 ui_mainPosition->setCheckedId (_layout.mainPos );
110111
111112 ui->borderEnabled ->setChecked (_layout.borderEnabled );
113+ ui->borderScreenEnabled ->setChecked (_layout.borderScreenEnabled );
112114 ui->borderWidth ->setValue (_layout.borderWidth );
113115 ui->borderColor ->setColor (QColor (_layout.borderColor ));
114116
115117 on_rows_valueChanged (_layout.rows );
116118 on_cols_valueChanged (_layout.cols );
119+ on_borderWidth_valueChanged (_layout.borderWidth );
117120}
118121
119122/* *
@@ -132,6 +135,7 @@ CustomLayout CustomLayoutDialog::getCustLayout() const
132135 layout.maxCols = ui->tileCols ->upperValue ();
133136
134137 layout.mainEnabled = ui->mainEnabled ->isChecked ();
138+ layout.borderScreenEnabled = ui->borderScreenEnabled ->isChecked ();
135139 layout.mainRows = ui->mainRows ->value ();
136140 layout.mainCols = ui->mainCols ->value ();
137141 layout.mainPos = static_cast <UM::ALIGN>(ui_mainPosition->checkedId ());
@@ -171,6 +175,15 @@ void CustomLayoutDialog::on_cols_valueChanged(int _val)
171175 ui->mainColsMaxLabel ->setText (QString::number (_val));
172176}
173177
178+ /* *
179+ * @brief Update border width label
180+ * @param _val
181+ */
182+ void CustomLayoutDialog::on_borderWidth_valueChanged (int _val)
183+ {
184+ ui->borderWidthLabel ->setText (QString::number (_val));
185+ }
186+
174187/* *
175188 * @brief Render the preview
176189 */
@@ -196,19 +209,25 @@ void CustomLayoutDialog::renderPreview()
196209 {
197210 QRect newBlock = UM::scaledRect (block, wRatio, hRatio);
198211
199- if (qAbs (newBlock.left () - size.width ()) <= 2 )
212+ if (qAbs (newBlock.left () - size.width ()) <= 3 )
200213 {
201- newBlock.setLeft (size.width ());
214+ newBlock.setLeft (size.width ()- 1 );
202215 }
203216
204- if (qAbs (newBlock.bottom () - size.height ()) <= 2 )
217+ if (qAbs (newBlock.bottom () - size.height ()) <= 3 )
205218 {
206- newBlock.setBottom (size.height ());
219+ newBlock.setBottom (size.height ()- 1 );
207220 }
208221
209222 blocks.append (newBlock);
210223 }
211224
225+ // draw background the same color of borders
226+ if (layout.borderEnabled )
227+ {
228+ m_scene->addRect (QRect (QPoint (0 , 0 ), size), Qt::NoPen, QBrush (QColor (layout.borderColor )));
229+ }
230+
212231 // draw blocks
213232 int i = 0 ;
214233 foreach (const QRect block, blocks)
@@ -235,6 +254,7 @@ void CustomLayoutDialog::renderPreview()
235254
236255 QPen pen;
237256 pen.setColor (QColor (layout.borderColor ));
257+ pen.setJoinStyle (Qt::MiterJoin);
238258 pen.setWidth (qRound ((double ) layout.borderWidth * size.width () / monitorWidth));
239259
240260 foreach (const QRect block, blocks)
@@ -256,6 +276,12 @@ void CustomLayoutDialog::renderPreview()
256276 }
257277 }
258278 }
279+
280+ if (layout.borderScreenEnabled )
281+ {
282+ QRect borderRect (pen.width ()/2 , pen.width ()/2 , size.width ()-pen.width ()-2 , size.height ()-pen.width ()-2 );
283+ m_scene->addRect (borderRect, pen, Qt::NoBrush);
284+ }
259285 }
260286
261287 ui->view ->update ();
0 commit comments