rpms/openoffice.org/devel openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch, NONE, 1.1 openoffice.org.spec, 1.1637, 1.1638

Caolan McNamara caolanm at fedoraproject.org
Thu Sep 4 17:27:46 UTC 2008


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15505

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch 
Log Message:
add openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch to get better
focus for new frames when already running and behind in stacking order



openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch:

--- NEW FILE openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch ---
Index: unx/gtk/window/gtkframe.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v
retrieving revision 1.72.8.2
diff -u -r1.72.8.2 gtkframe.cxx
--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx	23 Jan 2008 17:17:10 -0000	1.72.8.2
+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx	4 Sep 2008 17:21:25 -0000
@@ -757,7 +768,8 @@
         nStyle &= ~SAL_FRAME_STYLE_FLOAT;
     }
 
-    m_pWindow = GTK_WINDOW( gtk_widget_new( GTK_TYPE_WINDOW, "type", ((nStyle & SAL_FRAME_STYLE_FLOAT) && ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL, "visible", FALSE, NULL ) );
+    GtkWindowType eWinType = ((nStyle & SAL_FRAME_STYLE_FLOAT) && ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL;
+    m_pWindow = GTK_WINDOW( gtk_widget_new( GTK_TYPE_WINDOW, "type", eWinType, "visible", FALSE, NULL ) );
 	g_object_set_data( G_OBJECT( m_pWindow ), "SalFrame", this );
 
     m_pParent = static_cast<GtkSalFrame*>(pParent);
@@ -820,6 +832,9 @@
 
     InitCommon();
 
+    if (eWinType == GTK_WINDOW_TOPLEVEL)
+        gdk_x11_window_set_user_time(GTK_WIDGET(m_pWindow)->window, GDK_CURRENT_TIME);
+
     if( bDecoHandling )
     {
         gtk_window_set_resizable( m_pWindow, (nStyle & SAL_FRAME_STYLE_SIZEABLE) ? TRUE : FALSE );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1637
retrieving revision 1.1638
diff -u -r1.1637 -r1.1638
--- openoffice.org.spec	3 Sep 2008 14:18:41 -0000	1.1637
+++ openoffice.org.spec	4 Sep 2008 17:27:15 -0000	1.1638
@@ -112,6 +112,7 @@
 Patch42: openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch
 Patch43: openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
 Patch44: openoffice.org-3.0.0.oooXXXXX.filter.latex.patch
+Patch45: openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1295,6 +1296,7 @@
 %patch42 -p1 -b .ooo93366.fpicker_in_main.patch
 %patch43 -p1 -b .ooo93419.svx.ref_deref.before.ctored.patch
 %patch44 -p1 -b .oooXXXXX.filter.latex.patch
+%patch45 -p1 -b .oooXXXXX.vcl.jrb-frames.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3650,12 +3652,14 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Wed Sep 03 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-4.2
+* Thu Sep 04 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-4.2
 - Resolves: rhbz#460755 TryExec oowriter on brwriter.desktop etc
 - Resolves: rhbz#460883 openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
 - defuzz patches
 - add openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch
 - add openoffice.org-3.0.0.oooXXXXX.filter.latex.patch
+- add openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch to get better
+  focus for new frames when already running and behind in stacking order
 
 * Fri Aug 29 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-4.1
 - next milestone




More information about the fedora-extras-commits mailing list