From 98ab1afc7b7611598f8e67a4e384b9e3a1565733 Mon Sep 17 00:00:00 2001
From: manongjohn <dancel@ptd.net>
Date: Aug 13 2017 18:19:02 +0000
Subject: Fix frame blending into Xsheet Toolbar


---

diff --git a/toonz/sources/toonz/xshrowviewer.cpp b/toonz/sources/toonz/xshrowviewer.cpp
index fe323d9..3b826ae 100644
--- a/toonz/sources/toonz/xshrowviewer.cpp
+++ b/toonz/sources/toonz/xshrowviewer.cpp
@@ -517,6 +517,12 @@ void RowArea::paintEvent(QPaintEvent *event) {
     drawPinnedCenterKeys(p, r0, r1);
 
   drawPlayRange(p, r0, r1);
+  p.setPen(m_viewer->getVerticalLineColor());
+  p.setBrush(Qt::NoBrush);
+  if (m_viewer->orientation()->isVerticalTimeline())
+	  p.drawRect(toBeUpdated.adjusted(0, -1, -1, 0));
+  else
+	  p.drawRect(toBeUpdated.adjusted(-1, 0, 0, -1));
 }
 
 //-----------------------------------------------------------------------------
diff --git a/toonz/sources/toonzlib/orientation.cpp b/toonz/sources/toonzlib/orientation.cpp
index 3c91719..f352415 100644
--- a/toonz/sources/toonzlib/orientation.cpp
+++ b/toonz/sources/toonzlib/orientation.cpp
@@ -290,7 +290,7 @@ TopToBottomOrientation::TopToBottomOrientation() {
   addRect(PredefinedRect::FRAME_LABEL,
           QRect(CELL_WIDTH / 2, 1, CELL_WIDTH / 2, CELL_HEIGHT - 2));
   addRect(PredefinedRect::FRAME_HEADER,
-          QRect(0, 0, FRAME_HEADER_WIDTH - 1, CELL_HEIGHT));
+          QRect(0, 0, FRAME_HEADER_WIDTH, CELL_HEIGHT));
   addRect(PredefinedRect::PLAY_RANGE,
           QRect(PLAY_RANGE_X, 0, PLAY_MARKER_SIZE, CELL_HEIGHT));
   addRect(PredefinedRect::ONION,
@@ -586,7 +586,7 @@ LeftToRightOrientation::LeftToRightOrientation() {
   addRect(PredefinedRect::FRAME_LABEL,
           QRect(CELL_WIDTH / 4, 1, CELL_WIDTH / 2, FRAME_HEADER_HEIGHT - 2));
   addRect(PredefinedRect::FRAME_HEADER,
-          QRect(0, 0, CELL_WIDTH, FRAME_HEADER_HEIGHT - 1));
+          QRect(0, 0, CELL_WIDTH, FRAME_HEADER_HEIGHT));
   addRect(PredefinedRect::PLAY_RANGE,
           QRect(0, PLAY_RANGE_Y, CELL_WIDTH, PLAY_MARKER_SIZE));
   addRect(PredefinedRect::ONION,