From b990ae979cdebd46d2651cc90bfe93bd47b0142d Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Sat, 7 Feb 2015 23:34:23 +0000
Subject: [PATCH] More UI tweaks

---
 resources/ui/carla_plugin_basic_fx.ui |  8 ++++----
 resources/ui/carla_plugin_calf.ui     |  6 ------
 resources/ui/carla_plugin_zynfx.ui    |  8 +-------
 source/carla_skin.py                  | 11 ++++++++---
 4 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/resources/ui/carla_plugin_basic_fx.ui b/resources/ui/carla_plugin_basic_fx.ui
index 0a8814fe4..538fb8ac6 100644
--- a/resources/ui/carla_plugin_basic_fx.ui
+++ b/resources/ui/carla_plugin_basic_fx.ui
@@ -270,13 +270,13 @@
         <widget class="DigitalPeakMeter" name="peak_in" native="true">
          <property name="minimumSize">
           <size>
-           <width>80</width>
+           <width>100</width>
            <height>0</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>80</width>
+           <width>100</width>
            <height>16777215</height>
           </size>
          </property>
@@ -286,13 +286,13 @@
         <widget class="DigitalPeakMeter" name="peak_out" native="true">
          <property name="minimumSize">
           <size>
-           <width>80</width>
+           <width>100</width>
            <height>0</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>80</width>
+           <width>100</width>
            <height>16777215</height>
           </size>
          </property>
diff --git a/resources/ui/carla_plugin_calf.ui b/resources/ui/carla_plugin_calf.ui
index 172d0ce99..7127647e2 100644
--- a/resources/ui/carla_plugin_calf.ui
+++ b/resources/ui/carla_plugin_calf.ui
@@ -16,12 +16,6 @@
   <property name="windowTitle">
    <string>Frame</string>
   </property>
-  <property name="frameShape">
-   <enum>QFrame::StyledPanel</enum>
-  </property>
-  <property name="frameShadow">
-   <enum>QFrame::Raised</enum>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
     <number>0</number>
diff --git a/resources/ui/carla_plugin_zynfx.ui b/resources/ui/carla_plugin_zynfx.ui
index 69eb819d5..4c3c8306b 100644
--- a/resources/ui/carla_plugin_zynfx.ui
+++ b/resources/ui/carla_plugin_zynfx.ui
@@ -16,12 +16,6 @@
   <property name="windowTitle">
    <string>Frame</string>
   </property>
-  <property name="frameShape">
-   <enum>QFrame::StyledPanel</enum>
-  </property>
-  <property name="frameShadow">
-   <enum>QFrame::Raised</enum>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
     <number>0</number>
@@ -444,7 +438,7 @@
         <number>4</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
         <number>4</number>
diff --git a/source/carla_skin.py b/source/carla_skin.py
index 4bb5d8c19..d08dfa236 100755
--- a/source/carla_skin.py
+++ b/source/carla_skin.py
@@ -535,9 +535,14 @@ class AbstractPluginSlot(QFrame, PluginEditParentMeta):
         if self.w_knobs_left is not None:
             parameterCount = self.host.get_parameter_count(self.fPluginId)
 
+            if "calf" in self.fSkinStyle:
+                maxWidgets = 7
+            else:
+                maxWidgets = 8
+
             index = 0
             for i in range(parameterCount):
-                if index >= 8:
+                if index >= maxWidgets:
                     break
 
                 paramInfo   = self.host.get_parameter_info(self.fPluginId, i)
@@ -1694,10 +1699,10 @@ class PluginSlot_ZynFX(AbstractPluginSlot):
         painter = QPainter(self)
         painter.setBrush(Qt.transparent)
 
-        painter.setPen(QPen(QColor(60, 60, 60), 1))
+        painter.setPen(QPen(QColor(50, 50, 50), 1))
         painter.drawRect(0, 1, self.width()-1, self.height()-3)
 
-        painter.setPen(QPen(QColor(94, 94, 94), 1))
+        painter.setPen(QPen(QColor(64, 64, 64), 1))
         painter.drawLine(0, 0, self.width(), 0)
 
         AbstractPluginSlot.paintEvent(self, event)