Browse Source

Themeable rounding. Use smaller value for tiny versions.

Smaller value is guessed by distance between bottom box side and ports.
pull/170/head
Nikita Zlobin 7 years ago
parent
commit
cbb10c02cc
2 changed files with 8 additions and 4 deletions
  1. +3
    -4
      src/patchcanvas.py
  2. +5
    -0
      src/patchcanvas_theme.py

+ 3
- 4
src/patchcanvas.py View File

@@ -1984,7 +1984,6 @@ class CanvasBox(QGraphicsItem):
# Base Variables
self.p_width = 50
self.p_height = canvas.theme.box_header_height + canvas.theme.box_header_spacing + 1
self.p_rounding = 3.0

self.m_last_pos = QPointF()
self.m_splitted = False
@@ -2470,17 +2469,17 @@ class CanvasBox(QGraphicsItem):
else:
painter.setBrush(canvas.theme.box_bg_1)

painter.drawRoundedRect(QRectF(0.5, 0.5, self.p_width-1, self.p_height-1), self.p_rounding, self.p_rounding)
painter.drawRoundedRect(QRectF(0.5, 0.5, self.p_width-1, self.p_height-1), canvas.theme.box_rounding, canvas.theme.box_rounding)

# Draw pixmap header
if canvas.theme.box_header_pixmap:
painter.setPen(Qt.NoPen)
painter.setBrush(canvas.theme.box_bg_2)
painter.drawRoundedRect(QRectF(1, 1, self.p_width-2, canvas.theme.box_header_height), self.p_rounding-0.5, self.p_rounding-0.5)
painter.drawRoundedRect(QRectF(1, 1, self.p_width-2, canvas.theme.box_header_height), canvas.theme.box_rounding-0.5, canvas.theme.box_rounding-0.5)

# Including pixmap clip path
clipPath = QPainterPath()
clipPath.addRoundedRect(QRectF(1+1, 1+1, self.p_width-2-2, canvas.theme.box_header_height-2), self.p_rounding-1.5, self.p_rounding-1.5)
clipPath.addRoundedRect(QRectF(1+1, 1+1, self.p_width-2-2, canvas.theme.box_header_height-2), canvas.theme.box_rounding-1.5, canvas.theme.box_rounding-1.5)
painter.setClipPath(clipPath)
painter.setClipping(True)



+ 5
- 0
src/patchcanvas_theme.py View File

@@ -60,6 +60,7 @@ class Theme(object):
self.box_header_pixmap = None
self.box_header_height = 24
self.box_header_spacing = 0
self.box_rounding = 3.0

self.box_text = QPen(QColor(240, 240, 240), 0)
self.box_text_sel = self.box_text
@@ -142,6 +143,7 @@ class Theme(object):
self.box_header_pixmap = None
self.box_header_height = 14
self.box_header_spacing = 0
self.box_rounding = 2.0

self.box_text = QPen(QColor(240, 240, 240), 0)
self.box_text_sel = self.box_text
@@ -224,6 +226,7 @@ class Theme(object):
self.box_header_pixmap = None
self.box_header_height = 24
self.box_header_spacing = 0
self.box_rounding = 3.0

self.box_text = QPen(QColor(1, 1, 1), 0)
self.box_text_sel = self.box_text
@@ -306,6 +309,7 @@ class Theme(object):
self.box_header_pixmap = None
self.box_header_height = 19
self.box_header_spacing = 0
self.box_rounding = 3.0

self.box_text = QPen(QColor(255, 255, 255), 0)
self.box_text_sel = self.box_text
@@ -388,6 +392,7 @@ class Theme(object):
self.box_header_pixmap = QPixmap(":/bitmaps/canvas/frame_node_header.png")
self.box_header_height = 22
self.box_header_spacing = 6
self.box_rounding = 3.0

self.box_text = QPen(QColor(144, 144, 144), 0)
self.box_text_sel = QPen(QColor(189, 122, 214), 0)


Loading…
Cancel
Save