mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 03:29:02 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master'
This commit is contained in:
		
						commit
						74044754e2
					
				| @ -30,9 +30,13 @@ const TPL = ` | |||||||
|         height: 40px; |         height: 40px; | ||||||
|         width: 40px; |         width: 40px; | ||||||
|     } |     } | ||||||
|  |     .title-bar-buttons .top-btn.active{ | ||||||
|  |         background-color:var(--accented-background-color); | ||||||
|  |     } | ||||||
|     </style> |     </style> | ||||||
| 
 | 
 | ||||||
|     <!-- divs act as a hitbox for the buttons, making them clickable on corners --> |     <!-- divs act as a hitbox for the buttons, making them clickable on corners --> | ||||||
|  |     <div class="top-btn" title="Keep this window on top. "><button class="btn bx bx-pin"></button></div> | ||||||
|     <div class="minimize-btn"><button class="btn bx bx-minus"></button></div> |     <div class="minimize-btn"><button class="btn bx bx-minus"></button></div> | ||||||
|     <div class="maximize-btn"><button class="btn bx bx-checkbox"></button></div> |     <div class="maximize-btn"><button class="btn bx bx-checkbox"></button></div> | ||||||
|     <div class="close-btn"><button class="btn bx bx-x"></button></div> |     <div class="close-btn"><button class="btn bx bx-x"></button></div> | ||||||
| @ -47,10 +51,32 @@ export default class TitleBarButtonsWidget extends BasicWidget { | |||||||
|         this.$widget = $(TPL); |         this.$widget = $(TPL); | ||||||
|         this.contentSized(); |         this.contentSized(); | ||||||
| 
 | 
 | ||||||
|  |         const $topBtn = this.$widget.find(".top-btn"); | ||||||
|         const $minimizeBtn = this.$widget.find(".minimize-btn"); |         const $minimizeBtn = this.$widget.find(".minimize-btn"); | ||||||
|         const $maximizeBtn = this.$widget.find(".maximize-btn"); |         const $maximizeBtn = this.$widget.find(".maximize-btn"); | ||||||
|         const $closeBtn = this.$widget.find(".close-btn"); |         const $closeBtn = this.$widget.find(".close-btn"); | ||||||
| 
 | 
 | ||||||
|  |         //When the window is restarted, the window will not be reset when it is set to the top, so get the window status and set the icon background
 | ||||||
|  |         (function () { | ||||||
|  |             const remote = utils.dynamicRequire('@electron/remote'); | ||||||
|  |             if (remote.BrowserWindow.getFocusedWindow().isAlwaysOnTop()) { | ||||||
|  |                 $topBtn.addClass('active'); | ||||||
|  |             } | ||||||
|  |         }()); | ||||||
|  |         $topBtn.on('click', () => { | ||||||
|  |             $topBtn.trigger('blur'); | ||||||
|  |             const remote = utils.dynamicRequire('@electron/remote'); | ||||||
|  |             const focusedWindow = remote.BrowserWindow.getFocusedWindow(); | ||||||
|  |             const isAlwaysOnTop = focusedWindow.isAlwaysOnTop() | ||||||
|  |             if (isAlwaysOnTop) { | ||||||
|  |                 focusedWindow.setAlwaysOnTop(false) | ||||||
|  |                 $topBtn.removeClass('active'); | ||||||
|  |             } else { | ||||||
|  |                 focusedWindow.setAlwaysOnTop(true); | ||||||
|  |                 $topBtn.addClass('active'); | ||||||
|  |             } | ||||||
|  |         }); | ||||||
|  | 
 | ||||||
|         $minimizeBtn.on('click', () => { |         $minimizeBtn.on('click', () => { | ||||||
|             $minimizeBtn.trigger('blur'); |             $minimizeBtn.trigger('blur'); | ||||||
|             const remote = utils.dynamicRequire('@electron/remote'); |             const remote = utils.dynamicRequire('@electron/remote'); | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 zadam
						zadam