mirror of
				https://github.com/edubart/otclient.git
				synced 2025-11-04 04:36:23 +01:00 
			
		
		
		
	Minimap, hotkeys and lot of other changes
* Begin working on a new layout system for UIMinimap and later UIMap, this new layout system allows to add widgets to the minimap * Add option to disable motd * Rework hotkey binding * Lots of fixes in hotkeys manager * Add fullmap view using Ctrl+Shift+M * Prevent some crashs in ThingType draw * Add function to load minimap from PNG files * Fixes in minimap saving * Fixes in Tile::isClickable * Add UIMapAnchorLayout, new layout for maps * Fix freezes in win32 when pressing alt key
This commit is contained in:
		
							
								
								
									
										92
									
								
								src/client/uimapanchorlayout.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										92
									
								
								src/client/uimapanchorlayout.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,92 @@
 | 
			
		||||
/*
 | 
			
		||||
 * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
 | 
			
		||||
 *
 | 
			
		||||
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 | 
			
		||||
 * of this software and associated documentation files (the "Software"), to deal
 | 
			
		||||
 * in the Software without restriction, including without limitation the rights
 | 
			
		||||
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 | 
			
		||||
 * copies of the Software, and to permit persons to whom the Software is
 | 
			
		||||
 * furnished to do so, subject to the following conditions:
 | 
			
		||||
 *
 | 
			
		||||
 * The above copyright notice and this permission notice shall be included in
 | 
			
		||||
 * all copies or substantial portions of the Software.
 | 
			
		||||
 *
 | 
			
		||||
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 | 
			
		||||
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 | 
			
		||||
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 | 
			
		||||
 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 | 
			
		||||
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 | 
			
		||||
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 | 
			
		||||
 * THE SOFTWARE.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include "declarations.h"
 | 
			
		||||
#include "uimapanchorlayout.h"
 | 
			
		||||
#include "uiminimap.h"
 | 
			
		||||
#include <framework/ui/uiwidget.h>
 | 
			
		||||
 | 
			
		||||
int UIPositionAnchor::getHookedPoint(const UIWidgetPtr& hookedWidget, const UIWidgetPtr& parentWidget)
 | 
			
		||||
{
 | 
			
		||||
    UIMinimapPtr minimap = hookedWidget->static_self_cast<UIMinimap>();
 | 
			
		||||
    Rect hookedRect = minimap->getTileRect(m_hookedPosition);
 | 
			
		||||
    int point = 0;
 | 
			
		||||
        if(hookedRect.isValid()) {
 | 
			
		||||
        switch(m_hookedEdge) {
 | 
			
		||||
            case Fw::AnchorLeft:
 | 
			
		||||
                point = hookedRect.left();
 | 
			
		||||
                break;
 | 
			
		||||
            case Fw::AnchorRight:
 | 
			
		||||
                point = hookedRect.right();
 | 
			
		||||
                break;
 | 
			
		||||
            case Fw::AnchorTop:
 | 
			
		||||
                point = hookedRect.top();
 | 
			
		||||
                break;
 | 
			
		||||
            case Fw::AnchorBottom:
 | 
			
		||||
                point = hookedRect.bottom();
 | 
			
		||||
                break;
 | 
			
		||||
            case Fw::AnchorHorizontalCenter:
 | 
			
		||||
                point = hookedRect.horizontalCenter();
 | 
			
		||||
                break;
 | 
			
		||||
            case Fw::AnchorVerticalCenter:
 | 
			
		||||
                point = hookedRect.verticalCenter();
 | 
			
		||||
                break;
 | 
			
		||||
            default:
 | 
			
		||||
                // must never happens
 | 
			
		||||
                assert(false);
 | 
			
		||||
                break;
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    return point;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void UIMapAnchorLayout::addPositionAnchor(const UIWidgetPtr& anchoredWidget, Fw::AnchorEdge anchoredEdge, const Position& hookedPosition, Fw::AnchorEdge hookedEdge)
 | 
			
		||||
{
 | 
			
		||||
    if(!anchoredWidget)
 | 
			
		||||
        return;
 | 
			
		||||
 | 
			
		||||
    assert(anchoredWidget != getParentWidget());
 | 
			
		||||
 | 
			
		||||
    UIPositionAnchorPtr anchor(new UIPositionAnchor(anchoredEdge, hookedPosition, hookedEdge));
 | 
			
		||||
    UIAnchorGroupPtr& anchorGroup = m_anchorsGroups[anchoredWidget];
 | 
			
		||||
    if(!anchorGroup)
 | 
			
		||||
        anchorGroup = UIAnchorGroupPtr(new UIAnchorGroup);
 | 
			
		||||
 | 
			
		||||
    anchorGroup->addAnchor(anchor);
 | 
			
		||||
 | 
			
		||||
    // layout must be updated because a new anchor got in
 | 
			
		||||
    update();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void UIMapAnchorLayout::centerInPosition(const UIWidgetPtr& anchoredWidget, const Position& hookedPosition)
 | 
			
		||||
{
 | 
			
		||||
    addPositionAnchor(anchoredWidget, Fw::AnchorHorizontalCenter, hookedPosition, Fw::AnchorHorizontalCenter);
 | 
			
		||||
    addPositionAnchor(anchoredWidget, Fw::AnchorVerticalCenter, hookedPosition, Fw::AnchorVerticalCenter);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void UIMapAnchorLayout::fillPosition(const UIWidgetPtr& anchoredWidget, const Position& hookedPosition)
 | 
			
		||||
{
 | 
			
		||||
    addPositionAnchor(anchoredWidget, Fw::AnchorLeft, hookedPosition, Fw::AnchorLeft);
 | 
			
		||||
    addPositionAnchor(anchoredWidget, Fw::AnchorRight, hookedPosition, Fw::AnchorRight);
 | 
			
		||||
    addPositionAnchor(anchoredWidget, Fw::AnchorTop, hookedPosition, Fw::AnchorTop);
 | 
			
		||||
    addPositionAnchor(anchoredWidget, Fw::AnchorBottom, hookedPosition, Fw::AnchorBottom);
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user