fixed subclassing api

20tab · Mar 5, 2018 · 6dcbffe · 6dcbffe
1 parent a639bd4
commit 6dcbffe
Show file tree

Hide file tree

Showing 4 changed files with 490 additions and 561 deletions.
diff --git a/Source/PythonConsole/Private/PythonConsoleModule.cpp b/Source/PythonConsole/Private/PythonConsoleModule.cpp
@@ -93,71 +93,4 @@ TSharedRef< SWidget > FPythonConsoleModule::MakeConsoleInputBox( TSharedPtr< SEd
 	TSharedRef< SPythonConsoleInputBox > NewConsoleInputBox = SNew( SPythonConsoleInputBox );
 	OutExposedEditableTextBox = NewConsoleInputBox->GetEditableTextBox();
 	return NewConsoleInputBox;
-}
-
-
-void FPythonConsoleModule::TogglePythonConsoleForWindow( const TSharedRef< SWindow >& Window, const EPythonConsoleStyle::Type InStyle, const FPythonConsoleDelegates& PythonConsoleDelegates )
-{
-	bool bShouldOpen = true;
-	// Close an existing console box, if there is one
-	TSharedPtr< SWidget > PinnedPythonConsole( PythonConsole.Pin() );
-	if( PinnedPythonConsole.IsValid() )
-	{
-		// If the console is already open close it unless it is in a different window.  In that case reopen it on that window
-		bShouldOpen = false;
-		TSharedPtr< SWindow > WindowForExistingConsole = FSlateApplication::Get().FindWidgetWindow(PinnedPythonConsole.ToSharedRef());
-		if (WindowForExistingConsole.IsValid())
-		{
-			WindowForExistingConsole->RemoveOverlaySlot(PinnedPythonConsole.ToSharedRef());
-			PythonConsole.Reset();
-		}
-
-		if( WindowForExistingConsole != Window )
-		{
-			// Console is being opened on another window
-			bShouldOpen = true;
-		}
-	}
-
-	TSharedPtr<SDockTab> ActiveTab = FGlobalTabmanager::Get()->GetActiveTab();
-	if (ActiveTab.IsValid() && ActiveTab->GetLayoutIdentifier() == FTabId(PythonConsoleModule::PythonLogTabName))
-	{
-		FGlobalTabmanager::Get()->DrawAttention(ActiveTab.ToSharedRef());
-		bShouldOpen = false;
-	}
-
-	if( bShouldOpen )
-	{
-		const EPythonConsoleStyle::Type PythonConsoleStyle = InStyle;
-		TSharedRef< SPythonConsole > PythonConsoleRef = SNew( SPythonConsole, PythonConsoleStyle, this, &PythonConsoleDelegates );
-		PythonConsole = PythonConsoleRef;
-
-		const int32 MaximumZOrder = MAX_int32;
-		Window->AddOverlaySlot( MaximumZOrder )
-		.VAlign(VAlign_Bottom)
-		.HAlign(HAlign_Center)
-		.Padding( 10.0f )
-		[
-			PythonConsoleRef
-		];
-
-		// Force keyboard focus
-		PythonConsoleRef->SetFocusToEditableText();
-	}
-}
-
-
-void FPythonConsoleModule::ClosePythonConsole()
-{
-	TSharedPtr< SWidget > PinnedPythonConsole( PythonConsole.Pin() );
-
-	if( PinnedPythonConsole.IsValid() )
-	{
-		TSharedPtr< SWindow > WindowForExistingConsole = FSlateApplication::Get().FindWidgetWindow(PinnedPythonConsole.ToSharedRef());
-		if (WindowForExistingConsole.IsValid())
-		{
-			WindowForExistingConsole->RemoveOverlaySlot( PinnedPythonConsole.ToSharedRef() );
-			PythonConsole.Reset();
-		}
-	}
 }
diff --git a/Source/PythonConsole/Public/PythonConsoleModule.h b/Source/PythonConsole/Public/PythonConsoleModule.h
@@ -1,4 +1,4 @@
-// Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
+// Copyright 1998-2018 20Tab S.r.l. All Rights Reserved.
 
 #pragma once
 
@@ -33,12 +33,6 @@ class FPythonConsoleModule : public IModuleInterface
 	    output log DLL is unloaded on the fly. */
 	virtual TSharedRef< SWidget > MakeConsoleInputBox( TSharedPtr< SEditableTextBox >& OutExposedEditableTextBox ) const;
 
-	/** Opens a debug console in the specified window, if not already open */
-	virtual void TogglePythonConsoleForWindow( const TSharedRef< SWindow >& Window, const EPythonConsoleStyle::Type InStyle, const FPythonConsoleDelegates& PythonConsoleDelegates );
-
-	/** Closes the debug console for the specified window */
-	virtual void ClosePythonConsole();
-
 
 private: