mirror of
				https://github.com/SoftFever/OrcaSlicer.git
				synced 2025-10-20 07:11:12 -06:00 
			
		
		
		
	merge upstream changes
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
This commit is contained in:
		
							parent
							
								
									1bdedb1c47
								
							
						
					
					
						commit
						2492e5d39c
					
				
					 156 changed files with 33597 additions and 65667 deletions
				
			
		|  | @ -258,5 +258,14 @@ void Notebook::Init() | |||
|     m_showEffect = m_hideEffect = wxSHOW_EFFECT_NONE; | ||||
| 
 | ||||
|     m_showTimeout = m_hideTimeout = 0; | ||||
| 
 | ||||
|     /* On Linux, Gstreamer wxMediaCtrl does not seem to get along well with
 | ||||
|      * 32-bit X11 visuals (the overlay does not work).  Is this a wxWindows | ||||
|      * bug?  Is this a Gstreamer bug?  No idea, but it is our problem ...  | ||||
|      * and anyway, this transparency thing just isn't all that interesting, | ||||
|      * so we just don't do it on Linux.  | ||||
|      */ | ||||
| #ifndef __WXGTK__ | ||||
|     SetBackgroundStyle(wxBG_STYLE_TRANSPARENT); | ||||
| #endif | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 SoftFever
						SoftFever