? abi/src/Linux_2.2.14_i386_DBG ? abi/src/Linux_2.2.14_i386_OBJ Index: abi/src/af/xap/unix/Makefile =================================================================== RCS file: /cvsroot/abi/src/af/xap/unix/Makefile,v retrieving revision 1.35 diff -u -r1.35 Makefile --- abi/src/af/xap/unix/Makefile 2000/10/10 00:39:28 1.35 +++ abi/src/af/xap/unix/Makefile 2000/11/04 04:01:08 @@ -49,7 +49,12 @@ xap_UnixEncodingManager.cpp TARGETS= $(OBJS) -INCLUDES= -I/usr/X11R6/include +INCLUDES= -I/usr/X11R6/include \ + -I$(ABI_ROOT)/src/text/fmt/xp \ + -I$(ABI_ROOT)/src/text/ptbl/xp \ + -I$(ABI_ROOT)/src/wp/impexp/xp \ + -I$(ABI_ROOT)/src/wp/ap/xp + include $(ABI_ROOT)/src/config/abi_rules.mk Index: abi/src/af/xap/unix/xap_UnixFrame.cpp =================================================================== RCS file: /cvsroot/abi/src/af/xap/unix/xap_UnixFrame.cpp,v retrieving revision 1.91 diff -u -r1.91 xap_UnixFrame.cpp --- abi/src/af/xap/unix/xap_UnixFrame.cpp 2000/10/26 11:00:15 1.91 +++ abi/src/af/xap/unix/xap_UnixFrame.cpp 2000/11/04 04:01:24 @@ -38,7 +38,10 @@ #include "xav_View.h" #include "xad_Document.h" +/* This is required for dynamic zoom implimentation */ +#include "fv_View.h" + /*****************************************************************/ #define ENSUREP(p) do { UT_ASSERT(p); if (!p) goto Cleanup; } while (0) @@ -209,7 +212,8 @@ { XAP_UnixFrame * pUnixFrame = (XAP_UnixFrame *)gtk_object_get_user_data(GTK_OBJECT(w)); pUnixFrame->setTimeOfLastEvent(e->time); - AV_View * pView = pUnixFrame->getCurrentView(); + AV_View * pView = pUnixFrame->getCurrentView(); + EV_UnixMouse * pUnixMouse = static_cast(pUnixFrame->getMouse()); //UT_DEBUGMSG(("Ungrabbing mouse.\n")); @@ -227,9 +231,26 @@ XAP_UnixFrame * pUnixFrame = (XAP_UnixFrame *)gtk_object_get_user_data(GTK_OBJECT(w)); AV_View * pView = pUnixFrame->getCurrentView(); + FV_View * pfView = static_cast(pView); if (pView) pView->setWindowSize(e->width, e->height); + + // Dynamic Zoom Implimentation + UT_uint32 newZoom = 100; + switch(pUnixFrame->getZoomType()) + { + case XAP_Frame::z_PAGEWIDTH: + newZoom = pfView->calculateZoomPercentForPageWidth(); + pUnixFrame->setZoomPercentage(newZoom); + break; + case XAP_Frame::z_WHOLEPAGE: + newZoom = pfView->calculateZoomPercentForWholePage(); + pUnixFrame->setZoomPercentage(newZoom); + break; + default: + ; + } return 1; }