Attachment #45191 for issue #77451

View | Details | Raw Unified | Return to issue 77451
Collapse All | Expand All




}


// Helper returns an HIRect

HIRect ImplGetHIRectFromRectangle(Rectangle aRect)
{
    HIRect aHIRect;
    aHIRect.origin.x = static_cast<float>(aRect.Left());
    aHIRect.origin.y = static_cast<float>(aRect.Top());
    aHIRect.size.width = static_cast<float>(aRect.Right()) - static_cast<float>(aRect.Left());
    aHIRect.size.height = static_cast<float>(aRect.Bottom()) - static_cast<float>(aRect.Top());
	return aHIRect;
}

// Helper returns a Rectangle

Rectangle ImplGetRectangleFromHIRect( HIRect aHIRect )
{
	Rectangle aRect;
	aRect.Top() = static_cast<int>(aHIRect.origin.y);
	aRect.Left() = static_cast<int>(aHIRect.origin.x);
	aRect.Bottom() = static_cast<int>(aHIRect.size.height) + static_cast<short>(aHIRect.origin.y);
	aRect.Right() = static_cast<int>(aHIRect.origin.x) + static_cast<short>(aHIRect.size.width);
	return aRect;
}

// Helper returns a QD Rect

Rect ImplGetRectFromHIRect(HIRect aHIRect)
{
    Rect aRect;
    aRect.top = static_cast<short>(aHIRect.origin.y);
    aRect.left = static_cast<short>(aHIRect.origin.x);
    aRect.right= static_cast<short>(aHIRect.origin.x) + static_cast<short>(aHIRect.size.width);
    aRect.bottom = static_cast<short>(aHIRect.size.height) + static_cast<short>(aHIRect.origin.y);
    return aRect;
}

/*
 * IsNativeControlSupported()
 * --------------------------

            if( nPart == PART_ENTIRE_CONTROL ||
                nPart == PART_TABS_DRAW_RTL ||
                nPart == HAS_BACKGROUND_TEXTURE )
                return true;
            break;

        case CTRL_TOOLBAR: // ** TO DO + CHECK IF NEEDED **

{
    fprintf(stderr, "%s (%s, %s)\n", __func__, ImplDbgGetStringControlType(nType), ImplDbgGetStringControlPart(nPart));
    BOOL bOk = FALSE;
    
    HIRect rc = ImplGetHIRectFromRectangle( rControlRegion.GetBoundRect() );
   
    HIRect rc;
    rc.origin.x = static_cast<float>(buttonRect.Left());
    rc.origin.y = static_cast<float>(buttonRect.Top());
    rc.size.width = static_cast<float>(buttonRect.Right()) - static_cast<float>(buttonRect.Left());
    rc.size.height = static_cast<float>(buttonRect.Bottom()) - static_cast<float>(buttonRect.Top());

    /** Scrollbar parts code equivalent **
        PART_BUTTON_UP 101
        PART_BUTTON_DOWN 102


    switch( nType )
    {
        case CTRL_TOOLTIP:
       
        /*
        HMHelpContentRec (Declared in MacHelp.h )
        
        Describes a help tag.

        struct HMHelpContentRec {
                SInt32 version; 
                Rect absHotRect; 
                HMTagDisplaySide tagSide; 
                HMHelpContent content[2];
        };
        typedef struct HMHelpContentRec HMHelpContentRec;
        */
        
        HMHelpContent aContent;
        aContent.contentType = kHMTextResContent;//kHMCFStringContent;
        aContent.u.tagTextRes = NULL;//kHMCFStringContent;
        
        HMHelpContentRec aHelpContentRect;
        
        aHelpContentRect.version = 0;
        aHelpContentRect.absHotRect = ImplGetRectFromHIRect(rc);
        aHelpContentRect.tagSide = kHMOutsideBottomCenterAligned;
        aHelpContentRect.content[2]= aContent ;
        
        HMSetTagDelay ( 100 );
        
        if( BeginGraphics() )
            {
                HMDisplayTag (&aHelpContentRect ); 
                EndGraphics();
                return true;
            }
        else
            return false;
            
        break;
        
        // [FIXME] wait for clipping before to add the new controls below
        //case CTRL_FIXEDBORDER:
        //case CTRL_TAB_PANE:

Return to issue 77451

Lines 174-179 Link Here

(-)vcl/aqua/source/gdi/salnativewidgets.cxx (-10 / +80 lines)
174	}	174	}
175		175
176		176
		177	// Helper returns an HIRect
		178
		179	HIRect ImplGetHIRectFromRectangle(Rectangle aRect)
		180	{
		181	HIRect aHIRect;
		182	aHIRect.origin.x = static_cast<float>(aRect.Left());
		183	aHIRect.origin.y = static_cast<float>(aRect.Top());
		184	aHIRect.size.width = static_cast<float>(aRect.Right()) - static_cast<float>(aRect.Left());
		185	aHIRect.size.height = static_cast<float>(aRect.Bottom()) - static_cast<float>(aRect.Top());
		186	return aHIRect;
		187	}
		188
		189	// Helper returns a Rectangle
		190
		191	Rectangle ImplGetRectangleFromHIRect( HIRect aHIRect )
		192	{
		193	Rectangle aRect;
		194	aRect.Top() = static_cast<int>(aHIRect.origin.y);
		195	aRect.Left() = static_cast<int>(aHIRect.origin.x);
		196	aRect.Bottom() = static_cast<int>(aHIRect.size.height) + static_cast<short>(aHIRect.origin.y);
		197	aRect.Right() = static_cast<int>(aHIRect.origin.x) + static_cast<short>(aHIRect.size.width);
		198	return aRect;
		199	}
		200
		201	// Helper returns a QD Rect
		202
		203	Rect ImplGetRectFromHIRect(HIRect aHIRect)
		204	{
		205	Rect aRect;
		206	aRect.top = static_cast<short>(aHIRect.origin.y);
		207	aRect.left = static_cast<short>(aHIRect.origin.x);
		208	aRect.right= static_cast<short>(aHIRect.origin.x) + static_cast<short>(aHIRect.size.width);
		209	aRect.bottom = static_cast<short>(aHIRect.size.height) + static_cast<short>(aHIRect.origin.y);
		210	return aRect;
		211	}
		212
177	/*	213	/*
178	* IsNativeControlSupported()	214	* IsNativeControlSupported()
179	* --------------------------	215	* --------------------------
Lines 255-261 Link Here
255	if( nPart == PART_ENTIRE_CONTROL \|\|	291	if( nPart == PART_ENTIRE_CONTROL \|\|
256	nPart == PART_TABS_DRAW_RTL \|\|	292	nPart == PART_TABS_DRAW_RTL \|\|
257	nPart == HAS_BACKGROUND_TEXTURE )	293	nPart == HAS_BACKGROUND_TEXTURE )
258	return false;	294	return true;
259	break;	295	break;
260		296
261	case CTRL_TOOLBAR: // TO DO + CHECK IF NEEDED	297	case CTRL_TOOLBAR: // TO DO + CHECK IF NEEDED
Lines 472-486 Link Here
472	{	508	{
473	fprintf(stderr, "%s (%s, %s)\n", __func__, ImplDbgGetStringControlType(nType), ImplDbgGetStringControlPart(nPart));	509	fprintf(stderr, "%s (%s, %s)\n", __func__, ImplDbgGetStringControlType(nType), ImplDbgGetStringControlPart(nPart));
474	BOOL bOk = FALSE;	510	BOOL bOk = FALSE;
475		511
476	Rectangle buttonRect = rControlRegion.GetBoundRect();	512	HIRect rc = ImplGetHIRectFromRectangle( rControlRegion.GetBoundRect() );
477		513
478	HIRect rc;
479	rc.origin.x = static_cast<float>(buttonRect.Left());
480	rc.origin.y = static_cast<float>(buttonRect.Top());
481	rc.size.width = static_cast<float>(buttonRect.Right()) - static_cast<float>(buttonRect.Left());
482	rc.size.height = static_cast<float>(buttonRect.Bottom()) - static_cast<float>(buttonRect.Top());
483
484	/ Scrollbar parts code equivalent	514	/ Scrollbar parts code equivalent
485	PART_BUTTON_UP 101	515	PART_BUTTON_UP 101
486	PART_BUTTON_DOWN 102	516	PART_BUTTON_DOWN 102
Lines 494-499 Link Here
494		524
495	switch( nType )	525	switch( nType )
496	{	526	{
		527	case CTRL_TOOLTIP:
		528
		529	/*
		530	HMHelpContentRec (Declared in MacHelp.h )
		531
		532	Describes a help tag.
		533
		534	struct HMHelpContentRec {
		535	SInt32 version;
		536	Rect absHotRect;
		537	HMTagDisplaySide tagSide;
		538	HMHelpContent content[2];
		539	};
		540	typedef struct HMHelpContentRec HMHelpContentRec;
		541	*/
		542
		543	HMHelpContent aContent;
		544	aContent.contentType = kHMTextResContent;//kHMCFStringContent;
		545	aContent.u.tagTextRes = NULL;//kHMCFStringContent;
		546
		547	HMHelpContentRec aHelpContentRect;
		548
		549	aHelpContentRect.version = 0;
		550	aHelpContentRect.absHotRect = ImplGetRectFromHIRect(rc);
		551	aHelpContentRect.tagSide = kHMOutsideBottomCenterAligned;
		552	aHelpContentRect.content[2]= aContent ;
		553
		554	HMSetTagDelay ( 100 );
		555
		556	if( BeginGraphics() )
		557	{
		558	HMDisplayTag (&aHelpContentRect );
		559	EndGraphics();
		560	return true;
		561	}
		562	else
		563	return false;
		564
		565	break;
		566
497	// [FIXME] wait for clipping before to add the new controls below	567	// [FIXME] wait for clipping before to add the new controls below
498	//case CTRL_FIXEDBORDER:	568	//case CTRL_FIXEDBORDER:
499	//case CTRL_TAB_PANE:	569	//case CTRL_TAB_PANE: