Skip to content
This repository has been archived by the owner on Dec 5, 2022. It is now read-only.

Commit

Permalink
Merge pull request #42 from atom/trayupdate
Browse files Browse the repository at this point in the history
Update the Tray Demo re: Linux
  • Loading branch information
Jessica Lord committed Mar 1, 2016
2 parents 796a714 + 24e3154 commit dba6b21
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
14 changes: 13 additions & 1 deletion sections/native-ui/tray.html
Expand Up @@ -16,7 +16,7 @@ <h3>The <code>tray</code> module allows you to create an icon in the operating s
<section>
<div class="wrapper">
<h2 class="js-container-target">Tray
<div class="support avoid-clicks">Supports: Win, OS X, Linux | Process: Main</div>
<div class="support avoid-clicks">Supports: Win, OS X | Process: Main</div>
</h2>
<div class="toggle-content">
<button id="put-in-tray">Demo</button><span id="tray-countdown"></span>
Expand All @@ -31,6 +31,18 @@ <h5>Renderer Process</h5>
</div>
</section>

<section>
<div class="wrapper">
<div class="pro-tip">
<h2 class="avoid-clicks">Pro-Tip</h2>
<div class="non-toggle-content">
<strong>Tray support in Linux.</strong>
<p>Tray icons are not completely impossible on Linux systems but implementation is trickier and not all of Electron's Tray APIs are available. Check out the <a class="exlink" href="http://electron.atom.io/docs/latest/api/tray">full API documentation</a> for more details.</p>
</div>
</div>
</div>
</section>

<script type="text/javascript" src="renderer-process/native-ui/tray/tray.js"></script>

<script type="text/javascript">
Expand Down
2 changes: 1 addition & 1 deletion sections/windows/windows.html
Expand Up @@ -52,7 +52,7 @@ <h5>Renderer Process</h5>
<h2 class="avoid-clicks">Pro-Tip</h2>
<div class="non-toggle-content">
<strong>Use an invisible browser window to run background tasks.</strong>
<p>You can set a new browser window to not be shown (be invisible) in order to use that additional renderer process as a kind of new thread in which to run JavaScript in the background of your app. You do this by setting the <code>show</code> property to <code>false</code> when defining the new window.</h5>
<p>You can set a new browser window to not be shown (be invisible) in order to use that additional renderer process as a kind of new thread in which to run JavaScript in the background of your app. You do this by setting the <code>show</code> property to <code>false</code> when defining the new window.</p>
<pre><code>var win = new BrowserWindow({ width: 400, height: 225, show: false });</code></pre>
</div>
</div>
Expand Down

0 comments on commit dba6b21

Please sign in to comment.