Browse Source

carla skin: drawOutline: fixed positioning and optimization

pull/770/head
Nikita Zlobin 7 years ago
parent
commit
84a7b527a7
1 changed files with 12 additions and 6 deletions
  1. +12
    -6
      source/frontend/carla_skin.py

+ 12
- 6
source/frontend/carla_skin.py View File

@@ -25,11 +25,11 @@ from carla_config import *
# Imports (Global) # Imports (Global)


if config_UseQt5: if config_UseQt5:
from PyQt5.QtCore import Qt, QRectF
from PyQt5.QtCore import Qt, QRectF, QLineF
from PyQt5.QtGui import QFont, QFontDatabase, QPen, QPixmap from PyQt5.QtGui import QFont, QFontDatabase, QPen, QPixmap
from PyQt5.QtWidgets import QColorDialog, QFrame, QPushButton from PyQt5.QtWidgets import QColorDialog, QFrame, QPushButton
else: else:
from PyQt4.QtCore import Qt, QRectF
from PyQt4.QtCore import Qt, QRectF, QLineF
from PyQt4.QtGui import QFont, QFontDatabase, QPen, QPixmap from PyQt4.QtGui import QFont, QFontDatabase, QPen, QPixmap
from PyQt4.QtGui import QColorDialog, QFrame, QPushButton from PyQt4.QtGui import QColorDialog, QFrame, QPushButton


@@ -300,6 +300,10 @@ class AbstractPluginSlot(QFrame, PluginEditParentMeta):
host.OptionChangedCallback.connect(self.slot_handleOptionChangedCallback) host.OptionChangedCallback.connect(self.slot_handleOptionChangedCallback)
host.UiStateChangedCallback.connect(self.slot_handleUiStateChangedCallback) host.UiStateChangedCallback.connect(self.slot_handleUiStateChangedCallback)


# Prepare resources
self.sel_pen = QPen(Qt.cyan, 2, Qt.SolidLine, Qt.FlatCap, Qt.MiterJoin)
self.shadow_pen = QPen(Qt.black, 1)

# ----------------------------------------------------------------- # -----------------------------------------------------------------


@pyqtSlot(int, str) @pyqtSlot(int, str)
@@ -990,13 +994,15 @@ class AbstractPluginSlot(QFrame, PluginEditParentMeta):
def drawOutline(self, painter): def drawOutline(self, painter):
painter.save() painter.save()
painter.setBrush(Qt.transparent) painter.setBrush(Qt.transparent)
w = float(self.width())
h = float(self.height())


if self.fIsSelected: if self.fIsSelected:
painter.setPen(QPen(Qt.cyan, 4))
painter.drawRect(0, 0, self.width(), self.height())
painter.setPen(self.sel_pen)
painter.drawRect(1, 1, w-2, h-2)
else: else:
painter.setPen(QPen(Qt.black, 1))
painter.drawLine(0, self.height()-1, self.width(), self.height()-1)
painter.setPen(self.shadow_pen)
painter.drawLine(QLineF(0.5, h-1, w-1, h-1))


painter.restore() painter.restore()




Loading…
Cancel
Save