ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup ExposeDrawingArea a bit.

This commit is contained in:
riccardom 2010-05-15 16:02:56 +00:00
parent 9f10047113
commit 0bb50b5372
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
desmume/src/gtk/main.cpp
View File

@ -1111,10 +1111,9 @@ static gboolean ExposeDrawingArea (GtkWidget *widget, GdkEventExpose *event, gpo
guchar rgb[SCREENS_PIXEL_SIZE*SCREEN_BYTES_PER_PIXEL]; guchar rgb[SCREENS_PIXEL_SIZE*SCREEN_BYTES_PER_PIXEL];
gfloat vratio, hratio, nscreen_ratio; gfloat vratio, hratio, nscreen_ratio;
gint daW, daH, imgW, imgH, gint daW, daH, imgW, imgH, screenW, screenH, gapW, gapH;
primaryOffsetX, primaryOffsetY, secondaryOffsetX, secondaryOffsetY, gint primaryOffsetX, primaryOffsetY, secondaryOffsetX, secondaryOffsetY;
primaryPixbufOffsetX, primaryPixbufOffsetY, secondaryPixbufOffsetX, secondaryPixbufOffsetY, gint secondaryPixbufOffsetX, secondaryPixbufOffsetY;
screenW, screenH, gapW, gapH;
const gboolean gap_vertical = ((nds_screen.orientation == ORIENT_VERTICAL) ^ (nds_screen.rotation_angle == 90 || nds_screen.rotation_angle == 270)); const gboolean gap_vertical = ((nds_screen.orientation == ORIENT_VERTICAL) ^ (nds_screen.rotation_angle == 90 || nds_screen.rotation_angle == 270));
#if GTK_CHECK_VERSION(2,14,0) #if GTK_CHECK_VERSION(2,14,0)
@ -1168,8 +1167,6 @@ static gboolean ExposeDrawingArea (GtkWidget *widget, GdkEventExpose *event, gpo
secondaryPixbufOffsetX = screenW; secondaryPixbufOffsetX = screenW;
secondaryPixbufOffsetY = 0; secondaryPixbufOffsetY = 0;
} }
primaryPixbufOffsetX = 0;
primaryPixbufOffsetY = 0;
if ((nds_screen.swap) ^ if ((nds_screen.swap) ^
((nds_screen.orientation == ORIENT_VERTICAL && (nds_screen.rotation_angle == 90 || nds_screen.rotation_angle == 180)) || ((nds_screen.orientation == ORIENT_VERTICAL && (nds_screen.rotation_angle == 90 || nds_screen.rotation_angle == 180)) ||
@ -1199,7 +1196,7 @@ static gboolean ExposeDrawingArea (GtkWidget *widget, GdkEventExpose *event, gpo
drawPixbuf = resizedPixbuf; drawPixbuf = resizedPixbuf;
} }
gdk_draw_pixbuf(widget->window, NULL, drawPixbuf, primaryPixbufOffsetX, primaryPixbufOffsetY, primaryOffsetX, primaryOffsetY, screenW, screenH, gdk_draw_pixbuf(widget->window, NULL, drawPixbuf, 0, 0, primaryOffsetX, primaryOffsetY, screenW, screenH,
GDK_RGB_DITHER_NONE, 0,0); GDK_RGB_DITHER_NONE, 0,0);
if (nds_screen.orientation != ORIENT_SINGLE) { if (nds_screen.orientation != ORIENT_SINGLE) {