From owner-p4-projects@FreeBSD.ORG  Fri Sep 28 22:11:12 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2C6001065670; Fri, 28 Sep 2012 22:11:11 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D9844106566B
	for <perforce@freebsd.org>; Fri, 28 Sep 2012 22:11:10 +0000 (UTC)
	(envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id C29738FC15
	for <perforce@freebsd.org>; Fri, 28 Sep 2012 22:11:10 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q8SMBAh3092998
	for <perforce@freebsd.org>; Fri, 28 Sep 2012 22:11:10 GMT
	(envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q8SMBAR7092995
	for perforce@freebsd.org; Fri, 28 Sep 2012 22:11:10 GMT
	(envelope-from brooks@freebsd.org)
Date: Fri, 28 Sep 2012 22:11:10 GMT
Message-Id: <201209282211.q8SMBAR7092995@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 217888 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Sep 2012 22:11:12 -0000

http://p4web.freebsd.org/@@217888?ac=10

Change 217888 by brooks@brooks_zenith on 2012/09/28 22:10:32

	Make the About dialog harder to trigger by accident by requring a two
	finger swipe rather than a single finger one.  Allow pinch as well as
	one and two finger swipes to exit for better consistence.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/pictview.c#17 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/pictview.c#17 (text+ko) ====

@@ -612,8 +612,8 @@
 		err(1, "show_about() malloc");
 	fb_save(image);
 
-	fb_dialog(FBDT_WEST2CLOSE, fb_colour(0, 0, 0),
-	    fb_colour(0, 0, 255), fb_colour(0, 0, 0),
+	fb_dialog_gestures(TSGF_WEST | TSGF_2WEST | TSGF_ZOOM_OUT,
+	    fb_colour(0, 0, 0), fb_colour(0, 0, 255), fb_colour(0, 0, 0),
 	    "About the CHERI Demo", version_string);
 	ts_drain();
 	free(version_string);
@@ -685,7 +685,7 @@
       display_image = imgmap[x][y];
       ts_drain();
       break;
-    case TSG_EAST:
+    case TSG2_EAST:
       show_about();
       break;
     }