diff options
author | Tor Lillqvist <tml@iki.fi> | 2013-03-20 09:07:52 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2013-03-21 13:28:32 +0200 |
commit | 63dcca42cebd3cb6f020ec75c0d225e1d7232e1c (patch) | |
tree | f1b1442af9d7f6f4736ca9621389f6fcc78179e8 /vcl/ios/source/window/salobj.cxx | |
parent | 27388c9483b5e00b593ac126092c5bbb131492b0 (diff) |
Re-work the vcl aspects of the iOS port
Don't try to use similar code as for OS X to manage windows, events
etc. I.e. don't use UIKit in vcl to do that. Instead, just do as in
the Android port, use the "headless" vcl backend. Do keep using
CoreText, though, not FreeType & fontconfig.
Start changing the iOS "Viewer" app to correspond to the Android
"desktop" app (so it should be renamed).
Work in progress since a long time, several crucial details still
missing, but committing for now.
Change-Id: Iac5fbf8def415e4d0d21e5200450a373420ad7ee
Diffstat (limited to 'vcl/ios/source/window/salobj.cxx')
-rw-r--r-- | vcl/ios/source/window/salobj.cxx | 201 |
1 files changed, 0 insertions, 201 deletions
diff --git a/vcl/ios/source/window/salobj.cxx b/vcl/ios/source/window/salobj.cxx deleted file mode 100644 index 6543f4c26ed9..000000000000 --- a/vcl/ios/source/window/salobj.cxx +++ /dev/null @@ -1,201 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include <string.h> - -#include "ios/saldata.hxx" -#include "ios/salobj.h" -#include "ios/salframe.h" - -// ======================================================================= - -IosSalObject::IosSalObject( IosSalFrame* pFrame ) : - mpFrame( pFrame ), - mnClipX( -1 ), - mnClipY( -1 ), - mnClipWidth( -1 ), - mnClipHeight( -1 ), - mbClip( false ), - mnX( 0 ), - mnY( 0 ), - mnWidth( 20 ), - mnHeight( 20 ) -{ - maSysData.nSize = sizeof( maSysData ); - maSysData.pView = NULL; - - CGRect aInitFrame = { { 0, 0 }, { 20, 20 } }; - maSysData.pView = [[UIView alloc] initWithFrame: aInitFrame]; -} - -// ----------------------------------------------------------------------- - -IosSalObject::~IosSalObject() -{ - if( maSysData.pView ) - { - UIView *pView = maSysData.pView; - [pView removeFromSuperview]; - [pView release]; - } -#if 0 // ??? - if( mpClipView ) - { - [mpClipView removeFromSuperview]; - [mpClipView release]; - } -#endif -} - -/* - sadly there seems to be no way to impose clipping on a child view, - especially a QTMovieView which seems to ignore the current context - completely. Also there is no real way to shape a window; on Ios a - similar effect to non-rectangular windows is achieved by using a - non-opaque window and not painting where one wants the background - to shine through. - - With respect to SalObject this leaves us to having an NSClipView - containing the child view. Even a QTMovieView respects the boundaries of - that, which gives us a clip "region" consisting of one rectangle. - This is gives us an 80% solution only, though. -*/ - -// ----------------------------------------------------------------------- - -void IosSalObject::ResetClipRegion() -{ - mbClip = false; - setClippedPosSize(); -} - -// ----------------------------------------------------------------------- - -sal_uInt16 IosSalObject::GetClipRegionType() -{ - return SAL_OBJECT_CLIP_INCLUDERECTS; -} - -// ----------------------------------------------------------------------- - -void IosSalObject::BeginSetClipRegion( sal_uLong ) -{ - mbClip = false; -} - -// ----------------------------------------------------------------------- - -void IosSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) -{ - if( mbClip ) - { - if( nX < mnClipX ) - { - mnClipWidth += mnClipX - nX; - mnClipX = nX; - } - if( nX + nWidth > mnClipX + mnClipWidth ) - mnClipWidth = nX + nWidth - mnClipX; - if( nY < mnClipY ) - { - mnClipHeight += mnClipY - nY; - mnClipY = nY; - } - if( nY + nHeight > mnClipY + mnClipHeight ) - mnClipHeight = nY + nHeight - mnClipY; - } - else - { - mnClipX = nX; - mnClipY = nY; - mnClipWidth = nWidth; - mnClipHeight = nHeight; - mbClip = true; - } -} - -// ----------------------------------------------------------------------- - -void IosSalObject::EndSetClipRegion() -{ - setClippedPosSize(); -} - -// ----------------------------------------------------------------------- - -void IosSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) -{ - mnX = nX; - mnY = nY; - mnWidth = nWidth; - mnHeight = nHeight; - setClippedPosSize(); -} - -// ----------------------------------------------------------------------- - -void IosSalObject::setClippedPosSize() -{ - CGRect aViewRect = { { 0, 0 }, { static_cast<CGFloat>(mnWidth), static_cast<CGFloat>(mnHeight) } }; - if( maSysData.pView ) - { - UIView *pView = maSysData.pView; - [pView setFrame: aViewRect]; - } - - CGRect aClipViewRect = { { static_cast<CGFloat>(mnX), static_cast<CGFloat>(mnY) }, { static_cast<CGFloat>(mnWidth), static_cast<CGFloat>(mnHeight) } }; - CGPoint aClipPt = { 0, 0 }; - if( mbClip ) - { - aClipViewRect.origin.x += mnClipX; - aClipViewRect.origin.y += mnClipY; - aClipViewRect.size.width = mnClipWidth; - aClipViewRect.size.height = mnClipHeight; - aClipPt.x = mnClipX; - if( mnClipY == 0 ) - aClipPt.y = mnHeight - mnClipHeight; - } - - mpFrame->VCLToCocoaTouch( aClipViewRect, false ); -#if 0 // ??? - [mpClipView setFrame: aClipViewRect]; - - [mpClipView scrollToPoint: aClipPt]; -#endif -} - -// ----------------------------------------------------------------------- - -void IosSalObject::Show( sal_Bool /*bVisible*/ ) -{ -#if 0 // ??? - if( mpClipView ) - [mpClipView setHidden: (bVisible ? NO : YES)]; -#endif -} - -// ----------------------------------------------------------------------- - -const SystemEnvData* IosSalObject::GetSystemData() const -{ - return &maSysData; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |