From 85d3b779d07ad92b0f540ea52185777c3c3f5e48 Mon Sep 17 00:00:00 2001
From: tassaron
Date: Sat, 26 Aug 2017 21:23:44 -0400
Subject: fixed too-large Color sizes, fixed a redoing bug, rm pointless things

and now Ctrl+Alt+Shift+A gives a bunch of debug info
---
 src/components/color.py |  2 +-
 src/components/color.ui |  4 ++--
 src/components/text.py  | 13 ++++++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/components')

diff --git a/src/components/color.py b/src/components/color.py
index a55aa10..7d4f86d 100644
--- a/src/components/color.py
+++ b/src/components/color.py
@@ -102,7 +102,7 @@ class Component(Component):
         # Return a solid image at x, y
         if self.fillType == 0:
             frame = BlankFrame(width, height)
-            image = Image.new("RGBA", shapeSize, (r, g, b, 255))
+            image = FloodFrame(self.sizeWidth, self.sizeHeight, (r, g, b, 255))
             frame.paste(image, box=(self.x, self.y))
             return frame
 
diff --git a/src/components/color.ui b/src/components/color.ui
index 1865e60..c1713fb 100644
--- a/src/components/color.ui
+++ b/src/components/color.ui
@@ -204,7 +204,7 @@
           <number>0</number>
          </property>
          <property name="maximum">
-          <number>999999999</number>
+          <number>19200</number>
          </property>
          <property name="value">
           <number>0</number>
@@ -239,7 +239,7 @@
           </size>
          </property>
          <property name="maximum">
-          <number>999999999</number>
+          <number>10800</number>
          </property>
         </widget>
        </item>
diff --git a/src/components/text.py b/src/components/text.py
index 92f0599..32a108e 100644
--- a/src/components/text.py
+++ b/src/components/text.py
@@ -2,10 +2,13 @@ from PIL import ImageEnhance, ImageFilter, ImageChops
 from PyQt5.QtGui import QColor, QFont
 from PyQt5 import QtGui, QtCore, QtWidgets
 import os
+import logging
 
 from component import Component
 from toolkit.frame import FramePainter, PaintColor
 
+log = logging.getLogger('AVP.Components.Text')
+
 
 class Component(Component):
     name = 'Title Text'
@@ -76,16 +79,15 @@ class Component(Component):
     def getXY(self):
         '''Returns true x, y after considering alignment settings'''
         fm = QtGui.QFontMetrics(self.titleFont)
-        if self.alignment == 0:             # Left
-            x = int(self.xPosition)
+        x = self.pixelValForAttr('xPosition')
 
         if self.alignment == 1:             # Middle
             offset = int(fm.width(self.title)/2)
-            x = self.xPosition - offset
-
+            x -= offset
         if self.alignment == 2:             # Right
             offset = fm.width(self.title)
-            x = self.xPosition - offset
+            x -= offset
+
         return x, self.yPosition
 
     def loadPreset(self, pr, *args):
@@ -137,6 +139,7 @@ class Component(Component):
 
         image = FramePainter(width, height)
         x, y = self.getXY()
+        log.debug('Text position translates to %s, %s', x, y)
         if self.stroke > 0:
             outliner = QtGui.QPainterPathStroker()
             outliner.setWidth(self.stroke)
-- 
cgit v1.2.3