[Commit-gnuradio] [gnuradio] 05/05: Merge remote-tracking branch 'gnuradio-wg-grc/maint_grcwg' into maint

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit 5ac4940c2ed1400de10edf35efd47b7b905bd803
Author: Johnathan Corgan <address@hidden>
Date:   Tue Oct 13 19:03:11 2015 -0700

    Merge remote-tracking branch 'gnuradio-wg-grc/maint_grcwg' into maint
    
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.
---
 grc/gui/Block.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grc/gui/Block.py b/grc/gui/Block.py
index 11273a5..87db6a9 100644
--- a/grc/gui/Block.py
+++ b/grc/gui/Block.py
@@ -275,7 +275,7 @@ class Block(Element):
     def draw_comment(self, gc, window):
         if not self._comment_pixmap:
             return
-
         x, y = self.get_coordinate()
+        y += self.H if self.is_horizontal() else self.W
         window.draw_drawable(gc, self._comment_pixmap, 0, 0, x,
-                             y + self.H + BLOCK_LABEL_PADDING, -1, -1)
+                             y + BLOCK_LABEL_PADDING, -1, -1)