[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master c2c12c0 3/4: * graph/x11/grx11.c (grX11Surface)
From: |
Alexei Podtelezhnikov |
Subject: |
[freetype2-demos] master c2c12c0 3/4: * graph/x11/grx11.c (grX11Surface): Remove redundant fields. |
Date: |
Thu, 25 Jun 2020 23:39:36 -0400 (EDT) |
branch: master
commit c2c12c04df6f719882dc90434d5d350413d4b071
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>
* graph/x11/grx11.c (grX11Surface): Remove redundant fields.
(gr_win32_surface_{refresh_rectangle,listen_event}): Updated.
---
ChangeLog | 5 +++++
graph/win32/grwin32.c | 16 ++++------------
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a994772..bc1e4a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2020-06-25 Alexei Podtelezhnikov <apodtele@gmail.com>
+ * graph/x11/grx11.c (grX11Surface): Remove redundant fields.
+ (gr_win32_surface_{refresh_rectangle,listen_event}): Updated.
+
+2020-06-25 Alexei Podtelezhnikov <apodtele@gmail.com>
+
[graph/win32] Clean up refresh.
* graph/win32/grwin32.c (gr_win32_surface_refresh_rectangle): Copy
diff --git a/graph/win32/grwin32.c b/graph/win32/grwin32.c
index 660b28f..585ba1f 100644
--- a/graph/win32/grwin32.c
+++ b/graph/win32/grwin32.c
@@ -106,8 +106,6 @@
{
grSurface root;
HWND window;
- int window_width;
- int window_height;
LPBITMAPINFO pbmi;
char bmi[ sizeof(BITMAPINFO) + 256*sizeof(RGBQUAD) ];
grBitmap bgrBitmap; /* windows wants data in BGR format !! */
@@ -159,7 +157,7 @@ gr_win32_surface_refresh_rectangle(
x = 0;
}
- delta = x + w - surface->window_width;
+ delta = x + w - bitmap->width;
if ( delta > 0 )
w -= delta;
@@ -169,7 +167,7 @@ gr_win32_surface_refresh_rectangle(
y = 0;
}
- delta = y + h - surface->window_height;
+ delta = y + h - bitmap->rows;
if ( delta > 0 )
h -= delta;
@@ -307,9 +305,6 @@ gr_win32_surface_resize( grWin32Surface* surface,
pbmi->bmiHeader.biWidth = width;
pbmi->bmiHeader.biHeight = height;
- surface->window_width = width;
- surface->window_height = height;
-
return surface;
}
@@ -333,8 +328,8 @@ gr_win32_surface_listen_event( grWin32Surface* surface,
int height = HIWORD(msg.lParam);
- if ( ( width != surface->window_width ||
- height != surface->window_height ) &&
+ if ( ( width != surface->root.bitmap.width ||
+ height != surface->root.bitmap.rows ) &&
gr_win32_surface_resize( surface, width, height ) )
{
grevent->type = gr_event_resize;
@@ -479,9 +474,6 @@ gr_win32_surface_init( grWin32Surface* surface,
return 0; /* Unknown mode */
}
- surface->window_width = bitmap->width;
- surface->window_height = bitmap->rows;
-
{
DWORD style = WS_OVERLAPPEDWINDOW;
RECT WndRect;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master c2c12c0 3/4: * graph/x11/grx11.c (grX11Surface): Remove redundant fields.,
Alexei Podtelezhnikov <=