revert rev 541 : we don t need to duplicate x,y

git-svn-id: http://tint2.googlecode.com/svn/trunk@543 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
thilor77
2010-08-19 20:33:42 +00:00
parent d7914dd0ad
commit 9e81bcbf6a
2 changed files with 12 additions and 12 deletions

View File

@@ -27,7 +27,7 @@
#include "panel.h"
#include "timer.h"
static int x_original, y_original, x, y, width, height;
static int x, y, width, height;
// the next functions are helper functions for tooltip handling
void start_show_timeout();
@@ -78,8 +78,10 @@ void init_tooltip()
void tooltip_trigger_show(Area* area, Panel* p, XEvent *e)
{
// Position the tooltip in the center of the area
x = x_original = area->posx + area->width / 2 + e->xmotion.x_root - e->xmotion.x;
y = y_original = area->posy + area->height / 2 + e->xmotion.y_root - e->xmotion.y;
x = area->posx + area->width / 2 + e->xmotion.x_root - e->xmotion.x;
y = area->posy + area->height / 2 + e->xmotion.y_root - e->xmotion.y;
if (!panel_horizontal)
y -= height/2;
g_tooltip.panel = p;
if (g_tooltip.mapped && g_tooltip.area != area) {
tooltip_copy_text(area);
@@ -124,9 +126,6 @@ void tooltip_update_geometry()
width = 2*g_tooltip.bg->border.width + 2*g_tooltip.paddingx + r2.width;
height = 2*g_tooltip.bg->border.width + 2*g_tooltip.paddingy + r2.height;
x = x_original;
y = y_original;
Panel* panel = g_tooltip.panel;
if (panel_horizontal && panel_position & BOTTOM)
y = panel->posy-height;
@@ -137,9 +136,6 @@ void tooltip_update_geometry()
else
x = panel->posx - width;
if (!panel_horizontal)
y -= height/2;
g_object_unref(layout);
cairo_destroy(c);
cairo_surface_destroy(cs);