83380a7805
Conflicts: cppcanvas/source/mtfrenderer/transparencygroupaction.cxx l10ntools/scripts/localize.pl l10ntools/source/directory.cxx l10ntools/source/srciter.cxx padmin/Executable_spadmin.bin.mk padmin/Library_spa.mk svtools/inc/svtools/filter.hxx svtools/inc/svtools/grfmgr.hxx svtools/source/filter/filter.cxx svtools/source/filter/filter2.cxx svtools/source/filter/wmf/emfwr.cxx svtools/source/filter/wmf/enhwmf.cxx svtools/source/filter/wmf/winmtf.cxx svtools/source/filter/wmf/winmtf.hxx svtools/source/filter/wmf/winwmf.cxx svtools/source/filter/wmf/wmfwr.cxx svtools/source/graphic/grfmgr.cxx svtools/source/graphic/grfmgr2.cxx toolkit/source/controls/controlmodelcontainerbase.cxx toolkit/source/controls/unocontrol.cxx toolkit/source/helper/formpdfexport.cxx toolkit/source/helper/unowrapper.cxx vcl/Package_osx.mk vcl/aqua/source/app/salinst.cxx vcl/aqua/source/app/salsys.cxx vcl/aqua/source/dtrans/aqua_service.cxx vcl/aqua/source/dtrans/test_aquacb.cxx vcl/aqua/source/res/makefile.mk vcl/aqua/source/window/salframe.cxx vcl/aqua/source/window/salframeview.mm vcl/inc/aqua/salgdi.h vcl/inc/aqua/salinst.h vcl/inc/graphite_adaptors.hxx vcl/inc/graphite_cache.hxx vcl/inc/graphite_serverfont.hxx vcl/inc/impprn.hxx vcl/inc/svdata.hxx vcl/inc/unx/i18n_status.hxx vcl/inc/unx/saldata.hxx vcl/inc/unx/salfont.h vcl/inc/unx/salinst.h vcl/inc/unx/salprn.h vcl/inc/unx/salsys.h vcl/inc/unx/sm.hxx vcl/inc/vcl/gdimtf.hxx vcl/inc/vcl/graph.hxx vcl/inc/vcl/outdev.hxx vcl/inc/vcl/polyscan.hxx vcl/inc/vcl/svcompat.hxx vcl/inc/vcl/svgread.hxx vcl/inc/vcl/unobrok.hxx vcl/inc/win/salgdi.h vcl/inc/win/wincomp.hxx vcl/prj/d.lst vcl/source/app/dbggui.cxx vcl/source/app/idlemgr.cxx vcl/source/app/makefile.mk vcl/source/app/settings.cxx vcl/source/app/sound.cxx vcl/source/app/stdtext.cxx vcl/source/app/svapp.cxx vcl/source/app/svdata.cxx vcl/source/app/svmain.cxx vcl/source/app/timer.cxx vcl/source/app/unohelp.cxx vcl/source/components/dtranscomp.cxx vcl/source/control/button.cxx vcl/source/control/combobox.cxx vcl/source/control/ctrl.cxx vcl/source/control/edit.cxx vcl/source/control/field2.cxx vcl/source/control/ilstbox.cxx vcl/source/gdi/bitmap.cxx vcl/source/gdi/bitmapex.cxx vcl/source/gdi/cvtgrf.cxx vcl/source/gdi/font.cxx vcl/source/gdi/image.cxx vcl/source/gdi/imagerepository.cxx vcl/source/gdi/impbmp.cxx vcl/source/gdi/impgraph.cxx vcl/source/gdi/impimagetree.cxx vcl/source/gdi/jobset.cxx vcl/source/gdi/makefile.mk vcl/source/gdi/metaact.cxx vcl/source/gdi/outdev.cxx vcl/source/gdi/outdev2.cxx vcl/source/gdi/outdev5.cxx vcl/source/gdi/outdev6.cxx vcl/source/gdi/outmap.cxx vcl/source/gdi/polyscan.cxx vcl/source/gdi/print.cxx vcl/source/gdi/print2.cxx vcl/source/gdi/region.cxx vcl/source/gdi/salgdilayout.cxx vcl/source/gdi/sallayout.cxx vcl/source/gdi/svcompat.cxx vcl/source/gdi/virdev.cxx vcl/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/gcach_vdev.cxx vcl/source/glyphs/gcach_vdev.hxx vcl/source/glyphs/graphite_adaptors.cxx vcl/source/glyphs/graphite_cache.cxx vcl/source/glyphs/graphite_layout.cxx vcl/source/glyphs/graphite_serverfont.cxx vcl/source/glyphs/graphite_textsrc.hxx vcl/source/glyphs/makefile.mk vcl/source/src/makefile.mk vcl/source/window/accel.cxx vcl/source/window/brdwin.cxx vcl/source/window/btndlg.cxx vcl/source/window/dialog.cxx vcl/source/window/dndevdis.cxx vcl/source/window/dockmgr.cxx vcl/source/window/dockwin.cxx vcl/source/window/floatwin.cxx vcl/source/window/introwin.cxx vcl/source/window/keycod.cxx vcl/source/window/menu.cxx vcl/source/window/msgbox.cxx vcl/source/window/scrwnd.cxx vcl/source/window/split.cxx vcl/source/window/splitwin.cxx vcl/source/window/status.cxx vcl/source/window/syswin.cxx vcl/source/window/tabpage.cxx vcl/source/window/toolbox.cxx vcl/source/window/toolbox2.cxx vcl/source/window/window.cxx vcl/source/window/window2.cxx vcl/source/window/winproc.cxx vcl/source/window/wrkwin.cxx vcl/unx/generic/app/i18n_cb.cxx vcl/unx/generic/app/i18n_ic.cxx vcl/unx/generic/app/saldata.cxx vcl/unx/generic/app/saldisp.cxx vcl/unx/generic/app/salinst.cxx vcl/unx/generic/app/wmadaptor.cxx vcl/unx/generic/fontmanager/afm_hash.cpp vcl/unx/generic/gdi/salbmp.cxx vcl/unx/generic/gdi/salgdi3.cxx vcl/unx/generic/gdi/xrender_peer.cxx vcl/unx/generic/window/salframe.cxx vcl/unx/generic/window/salobj.cxx vcl/unx/gtk/a11y/makefile.mk vcl/unx/gtk/app/gtksys.cxx vcl/unx/gtk/app/makefile.mk vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkobject.cxx vcl/unx/headless/svpinst.cxx vcl/unx/headless/svpinst.hxx vcl/unx/headless/svpprn.hxx vcl/unx/kde/kdedata.cxx vcl/unx/kde/salnativewidgets-kde.cxx vcl/unx/kde4/KDESalDisplay.hxx vcl/unx/kde4/KDEXLib.cxx vcl/unx/kde4/KDEXLib.hxx vcl/unx/kde4/VCLKDEApplication.cxx vcl/unx/kde4/makefile.mk vcl/unx/source/app/makefile.mk vcl/unx/source/fontmanager/makefile.mk vcl/unx/source/gdi/makefile.mk vcl/unx/source/inc/salcursors.h vcl/util/linksvp/makefile.mk vcl/win/source/app/saldata.cxx vcl/win/source/app/salinst.cxx vcl/win/source/app/salshl.cxx vcl/win/source/gdi/makefile.mk vcl/win/source/gdi/salbmp.cxx vcl/win/source/gdi/salgdi.cxx vcl/win/source/gdi/salgdi2.cxx vcl/win/source/gdi/salgdi3.cxx vcl/win/source/gdi/salgdi_gdiplus.cxx vcl/win/source/gdi/salprn.cxx vcl/win/source/gdi/salvd.cxx vcl/win/source/gdi/winlayout.cxx vcl/win/source/window/salframe.cxx vcl/win/source/window/salmenu.cxx vcl/win/source/window/salobj.cxx
215 lines
8.1 KiB
Text
Executable file
215 lines
8.1 KiB
Text
Executable file
/*************************************************************************
|
|
*
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
*
|
|
* Copyright 2000, 2010 Oracle and/or its affiliates.
|
|
*
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
|
*
|
|
* This file is part of OpenOffice.org.
|
|
*
|
|
* OpenOffice.org is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License version 3
|
|
* only, as published by the Free Software Foundation.
|
|
*
|
|
* OpenOffice.org is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License version 3 for more details
|
|
* (a copy is included in the LICENSE file that accompanied this code).
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* version 3 along with OpenOffice.org. If not, see
|
|
* <http://www.openoffice.org/license.html>
|
|
* for a copy of the LGPLv3 License.
|
|
*
|
|
************************************************************************/
|
|
|
|
// MARKER(update_precomp.py): autogen include statement, do not remove
|
|
#include "precompiled_vcl.hxx"
|
|
|
|
#include "aqua/salinst.h"
|
|
#include "aqua/saldata.hxx"
|
|
#include "aqua/salframe.h"
|
|
#include "aqua/salmenu.h"
|
|
#include "aqua/salnsmenu.h"
|
|
|
|
#include "vcl/window.hxx"
|
|
|
|
@implementation SalNSMenu
|
|
-(id)initWithMenu: (AquaSalMenu*)pMenu
|
|
{
|
|
mpMenu = pMenu;
|
|
return [super initWithTitle: [NSString string]];
|
|
}
|
|
|
|
-(void)menuNeedsUpdate: (NSMenu*)pMenu
|
|
{
|
|
(void)pMenu;
|
|
YIELD_GUARD;
|
|
|
|
if( mpMenu )
|
|
{
|
|
const AquaSalFrame* pFrame = mpMenu->getFrame();
|
|
if( pFrame && AquaSalFrame::isAlive( pFrame ) )
|
|
{
|
|
SalMenuEvent aMenuEvt;
|
|
aMenuEvt.mnId = 0;
|
|
aMenuEvt.mpMenu = mpMenu->mpVCLMenu;
|
|
if( aMenuEvt.mpMenu )
|
|
{
|
|
pFrame->CallCallback(SALEVENT_MENUACTIVATE, &aMenuEvt);
|
|
pFrame->CallCallback(SALEVENT_MENUDEACTIVATE, &aMenuEvt);
|
|
}
|
|
else
|
|
OSL_FAIL( "unconnected menu" );
|
|
}
|
|
}
|
|
}
|
|
|
|
-(void)setSalMenu: (AquaSalMenu*)pMenu
|
|
{
|
|
mpMenu = pMenu;
|
|
}
|
|
@end
|
|
|
|
@implementation SalNSMenuItem
|
|
-(id)initWithMenuItem: (AquaSalMenuItem*)pMenuItem
|
|
{
|
|
mpMenuItem = pMenuItem;
|
|
id ret = [super initWithTitle: [NSString string]
|
|
action: @selector(menuItemTriggered:)
|
|
keyEquivalent: [NSString string]];
|
|
[ret setTarget: self];
|
|
return ret;
|
|
}
|
|
-(void)menuItemTriggered: (id)aSender
|
|
{
|
|
(void)aSender;
|
|
YIELD_GUARD;
|
|
|
|
const AquaSalFrame* pFrame = mpMenuItem->mpParentMenu ? mpMenuItem->mpParentMenu->getFrame() : NULL;
|
|
if( pFrame && AquaSalFrame::isAlive( pFrame ) && ! pFrame->GetWindow()->IsInModalMode() )
|
|
{
|
|
SalMenuEvent aMenuEvt( mpMenuItem->mnId, mpMenuItem->mpVCLMenu );
|
|
pFrame->CallCallback(SALEVENT_MENUCOMMAND, &aMenuEvt);
|
|
}
|
|
else if( mpMenuItem->mpVCLMenu )
|
|
{
|
|
// if an item from submenu was selected. the corresponding Window does not exist because
|
|
// we use native popup menus, so we have to set the selected menuitem directly
|
|
// incidentally this of course works for top level popup menus, too
|
|
PopupMenu * pPopupMenu = dynamic_cast<PopupMenu *>(mpMenuItem->mpVCLMenu);
|
|
if( pPopupMenu )
|
|
{
|
|
// FIXME: revise this ugly code
|
|
|
|
// select handlers in vcl are dispatch on the original menu
|
|
// if not consumed by the select handler of the current menu
|
|
// however since only the starting menu ever came into Execute
|
|
// the hierarchy is not build up. Workaround this by getting
|
|
// the menu it should have been
|
|
|
|
// get started from hierarchy in vcl menus
|
|
AquaSalMenu* pParentMenu = mpMenuItem->mpParentMenu;
|
|
Menu* pCurMenu = mpMenuItem->mpVCLMenu;
|
|
while( pParentMenu && pParentMenu->mpVCLMenu )
|
|
{
|
|
pCurMenu = pParentMenu->mpVCLMenu;
|
|
pParentMenu = pParentMenu->mpParentSalMenu;
|
|
}
|
|
|
|
pPopupMenu->SetSelectedEntry( mpMenuItem->mnId );
|
|
pPopupMenu->ImplSelectWithStart( pCurMenu );
|
|
}
|
|
else
|
|
OSL_FAIL( "menubar item without frame !" );
|
|
}
|
|
}
|
|
@end
|
|
|
|
@implementation OOStatusItemView
|
|
-(void)drawRect: (NSRect)aRect
|
|
{
|
|
NSGraphicsContext* pContext = [NSGraphicsContext currentContext];
|
|
[pContext saveGraphicsState];
|
|
[SalData::getStatusItem() drawStatusBarBackgroundInRect: aRect withHighlight: NO];
|
|
if( AquaSalMenu::pCurrentMenuBar )
|
|
{
|
|
const std::vector< AquaSalMenu::MenuBarButtonEntry >& rButtons( AquaSalMenu::pCurrentMenuBar->getButtons() );
|
|
NSRect aFrame = [self frame];
|
|
NSRect aImgRect = { { 2, 0 }, { 0, 0 } };
|
|
for( size_t i = 0; i < rButtons.size(); ++i )
|
|
{
|
|
NSRect aFromRect = { { 0, 0 },
|
|
{ rButtons[i].maButton.maImage.GetSizePixel().Width(),
|
|
rButtons[i].maButton.maImage.GetSizePixel().Height() } };
|
|
aImgRect.origin.y = floor((aFrame.size.height - aFromRect.size.height)/2);
|
|
aImgRect.size = aFromRect.size;
|
|
if( rButtons[i].mpNSImage )
|
|
[rButtons[i].mpNSImage drawInRect: aImgRect fromRect: aFromRect operation: NSCompositeSourceOver fraction: 1.0];
|
|
aImgRect.origin.x += aFromRect.size.width + 2;
|
|
}
|
|
}
|
|
[pContext restoreGraphicsState];
|
|
}
|
|
|
|
-(void)mouseUp: (NSEvent *)pEvent
|
|
{
|
|
/* check if button goes up inside one of our status buttons */
|
|
if( AquaSalMenu::pCurrentMenuBar )
|
|
{
|
|
const std::vector< AquaSalMenu::MenuBarButtonEntry >& rButtons( AquaSalMenu::pCurrentMenuBar->getButtons() );
|
|
NSRect aFrame = [self frame];
|
|
NSRect aImgRect = { { 2, 0 }, { 0, 0 } };
|
|
NSPoint aMousePt = [pEvent locationInWindow];
|
|
for( size_t i = 0; i < rButtons.size(); ++i )
|
|
{
|
|
NSRect aFromRect = { { 0, 0 },
|
|
{ rButtons[i].maButton.maImage.GetSizePixel().Width(),
|
|
rButtons[i].maButton.maImage.GetSizePixel().Height() } };
|
|
aImgRect.origin.y = (aFrame.size.height - aFromRect.size.height)/2;
|
|
aImgRect.size = aFromRect.size;
|
|
if( aMousePt.x >= aImgRect.origin.x && aMousePt.x <= (aImgRect.origin.x+aImgRect.size.width) &&
|
|
aMousePt.y >= aImgRect.origin.y && aMousePt.y <= (aImgRect.origin.y+aImgRect.size.height) )
|
|
{
|
|
if( AquaSalMenu::pCurrentMenuBar->mpFrame && AquaSalFrame::isAlive( AquaSalMenu::pCurrentMenuBar->mpFrame ) )
|
|
{
|
|
SalMenuEvent aMenuEvt( rButtons[i].maButton.mnId, AquaSalMenu::pCurrentMenuBar->mpVCLMenu );
|
|
AquaSalMenu::pCurrentMenuBar->mpFrame->CallCallback(SALEVENT_MENUBUTTONCOMMAND, &aMenuEvt);
|
|
}
|
|
return;
|
|
}
|
|
|
|
aImgRect.origin.x += aFromRect.size.width + 2;
|
|
}
|
|
}
|
|
}
|
|
|
|
-(void)layout
|
|
{
|
|
NSStatusBar* pStatBar = [NSStatusBar systemStatusBar];
|
|
NSSize aSize = { 0, [pStatBar thickness] };
|
|
[self removeAllToolTips];
|
|
if( AquaSalMenu::pCurrentMenuBar )
|
|
{
|
|
const std::vector< AquaSalMenu::MenuBarButtonEntry >& rButtons( AquaSalMenu::pCurrentMenuBar->getButtons() );
|
|
if( ! rButtons.empty() )
|
|
{
|
|
aSize.width = 2;
|
|
for( size_t i = 0; i < rButtons.size(); ++i )
|
|
{
|
|
NSRect aImgRect = { { aSize.width, floor((aSize.height-rButtons[i].maButton.maImage.GetSizePixel().Height())/2) },
|
|
{ rButtons[i].maButton.maImage.GetSizePixel().Width(),
|
|
rButtons[i].maButton.maImage.GetSizePixel().Height() } };
|
|
if( rButtons[i].mpToolTipString )
|
|
[self addToolTipRect: aImgRect owner: rButtons[i].mpToolTipString userData: NULL];
|
|
aSize.width += 2 + aImgRect.size.width;
|
|
}
|
|
}
|
|
}
|
|
[self setFrameSize: aSize];
|
|
}
|
|
@end
|
|
|
|
|