Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-13 11:15:27 +00:00
Code Issues Releases Activity

conky.cc: fix window positioning on non-primary monitors (#615)

Browse Source
This commit is contained in:
Mike Kazantsev 2018-08-15 19:06:52 +05:00 committed by lasers
parent 41f920671c
commit 99e4407a45
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/conky.cc
View File

@ -1081,7 +1081,7 @@ static void update_text_area() {
case TOP_LEFT: case TOP_LEFT:
case TOP_RIGHT: case TOP_RIGHT:
case TOP_MIDDLE: case TOP_MIDDLE:
y = gap_y.get(*state); y = workarea[1] + gap_y.get(*state);
break; break;
case BOTTOM_LEFT: case BOTTOM_LEFT:
@ -1094,7 +1094,7 @@ static void update_text_area() {
case MIDDLE_LEFT: case MIDDLE_LEFT:
case MIDDLE_RIGHT: case MIDDLE_RIGHT:
case MIDDLE_MIDDLE: case MIDDLE_MIDDLE:
y = workarea[3] / 2 - text_height / 2 - gap_y.get(*state); y = workarea[1] + (workarea[3] - workarea[1]) / 2 - text_height / 2 - gap_y.get(*state);
break; break;
} }
switch (align) { switch (align) {
@ -1102,7 +1102,7 @@ static void update_text_area() {
case BOTTOM_LEFT: case BOTTOM_LEFT:
case MIDDLE_LEFT: case MIDDLE_LEFT:
default: default:
x = gap_x.get(*state); x = workarea[0] + gap_x.get(*state);
break; break;
case TOP_RIGHT: case TOP_RIGHT:
@ -1114,7 +1114,7 @@ static void update_text_area() {
case TOP_MIDDLE: case TOP_MIDDLE:
case BOTTOM_MIDDLE: case BOTTOM_MIDDLE:
case MIDDLE_MIDDLE: case MIDDLE_MIDDLE:
x = workarea[2] / 2 - text_width / 2 - gap_x.get(*state); x = workarea[0] + (workarea[2] - workarea[0]) / 2 - text_width / 2 - gap_x.get(*state);
break; break;
} }
#ifdef OWN_WINDOW #ifdef OWN_WINDOW
@ -1129,9 +1129,6 @@ static void update_text_area() {
#ifdef OWN_WINDOW #ifdef OWN_WINDOW
if (own_window.get(*state) && (fixed_pos == 0)) { if (own_window.get(*state) && (fixed_pos == 0)) {
x += workarea[0];
y += workarea[1];
int border_total = get_border_total(); int border_total = get_border_total();
text_start_x = text_start_y = border_total; text_start_x = text_start_y = border_total;
window.x = x - border_total; window.x = x - border_total;
@ -1139,14 +1136,6 @@ static void update_text_area() {
} else } else
#endif #endif
{ {
/* If window size doesn't match to workarea's size,
* then window probably includes panels (gnome).
* Blah, doesn't work on KDE. */
if (workarea[2] != window.width || workarea[3] != window.height) {
y += workarea[1];
x += workarea[0];
}
text_start_x = x; text_start_x = x;
text_start_y = y; text_start_y = y;
} }