X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcwindowbase.C;h=e64b2eb04b15fbed85aa667d67aaec122acb650c;hb=6e880be00673eac08e9463e3ce752aaf4c18085b;hp=a35645ad05d707ecac9c1d2b68b33d8c86530a3e;hpb=9e3d90a964c0fbe97c0b58235336a47111932d5d;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C
index a35645ad..e64b2eb0 100644
--- a/cinelerra-5.1/guicast/bcwindowbase.C
+++ b/cinelerra-5.1/guicast/bcwindowbase.C
@@ -1022,8 +1022,8 @@ if( debug && event->type != ClientMessage ) {
 
 //printf("BC_WindowBase::dispatch_event %d %d\n", __LINE__, button_number);
 		event_win = event->xany.window;
-		if (button_number < 6) {
-			if(button_number < 4)
+		if( button_number < 6 ) {
+			if( button_number < 4 )
 				button_down = 1;
 			button_pressed = event->xbutton.button;
 			button_time1 = button_time2;
@@ -1036,23 +1036,20 @@ if( debug && event->type != ClientMessage ) {
 			drag_x2 = cursor_x + get_resources()->drag_radius;
 			drag_y1 = cursor_y - get_resources()->drag_radius;
 			drag_y2 = cursor_y + get_resources()->drag_radius;
-
-			if((long)(button_time3 - button_time1) < resources->double_click * 2)
-			{
-				triple_click = 1;
-				button_time3 = button_time2 = button_time1 = 0;
-			}
-			if((long)(button_time3 - button_time2) < resources->double_click)
-			{
-				double_click = 1;
-//				button_time3 = button_time2 = button_time1 = 0;
-			}
-			else
-			{
-				triple_click = 0;
-				double_click = 0;
+			if( button_number < 4 ) {
+				if((long)(button_time3 - button_time1) < resources->double_click * 2) {
+					triple_click = 1;
+					button_time3 = button_time2 = button_time1 = 0;
+				}
+				if((long)(button_time3 - button_time2) < resources->double_click) {
+					double_click = 1;
+//					button_time3 = button_time2 = button_time1 = 0;
+				}
+				else {
+					triple_click = 0;
+					double_click = 0;
+				}
 			}
-
 			dispatch_button_press();
 		}
 		break;
@@ -3910,9 +3907,9 @@ void BC_WindowBase::get_pop_cursor(int &px, int &py, int lock_window)
 	get_abs_cursor(px, py, lock_window);
 	if( px < xmargin ) px = xmargin;
 	if( py < ymargin ) py = ymargin;
-	int wd = get_screen_w(lock_window,-1) - xmargin;
+	int wd = get_screen_x(lock_window,-1) + get_screen_w(lock_window,-1) - xmargin;
 	if( px > wd ) px = wd;
-	int ht = get_screen_h(lock_window,-1) - ymargin;
+	int ht = get_screen_y(lock_window,-1) + get_screen_h(lock_window,-1) - ymargin;
 	if( py > ht ) py = ht;
 }
 int BC_WindowBase::get_pop_cursor_x(int lock_window)