Skip to content

Commit 09880ec

Browse files
committed
Fix download btn on macOS.
1 parent 01fa606 commit 09880ec

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

InterSpec_resources/ColorThemeWindow.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ div.AddColorTheme.Wt-disabled, div.DeleteColorTheme.Wt-disabled
5959

6060
}
6161

62+
a.DownloadLink.DownloadColorTheme > span
63+
{
64+
margin-top: 7px;
65+
}
66+
6267
.UploadColorTheme
6368
{
6469

src/ColorThemeWindow.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,13 +214,22 @@ m_apply( nullptr )
214214
upload->clicked().connect( this, &ColorThemeWindow::uploadThemeCallback );
215215

216216
JsonDownloadResource *downloadResource = new JsonDownloadResource( this );
217+
218+
#if( BUILD_AS_OSX_APP )
219+
WAnchor *download = new WAnchor( WLink(downloadResource), adSubDiv );
220+
download->setTarget( AnchorTarget::TargetNewWindow );
221+
download->setStyleClass( "LinkBtn DownloadLink DownloadColorTheme" );
222+
download->setTarget( AnchorTarget::TargetNewWindow );
223+
download->setText( " " );
224+
#else
217225
WPushButton *download = new WPushButton( adSubDiv );
218226
download->setIcon( "InterSpec_resources/images/download_small.svg" );
219227
download->setLink( WLink(downloadResource) );
220228
download->setLinkTarget( Wt::TargetNewWindow );
221229
download->setStyleClass( "LinkBtn DownloadBtn DownloadColorTheme" );
222-
download->setToolTip( "Exports the currently selected theme to a JSON file.", Wt::PlainText );
230+
#endif
223231

232+
download->setToolTip( "Exports the currently selected theme to a JSON file.", Wt::PlainText );
224233

225234
leftMenuDivLayout->setRowStretch( 0, 1 );
226235

src/ShieldingSourceDisplay.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4435,10 +4435,12 @@ void ShieldingSourceDisplay::showCalcLog()
44354435
#if( BUILD_AS_OSX_APP )
44364436
WAnchor *logDownload = new WAnchor( m_logDiv->footer() );
44374437
logDownload->setStyleClass( "LinkBtn" );
4438+
logDownload->setTarget( AnchorTarget::TargetNewWindow );
44384439
#else
44394440
WPushButton *logDownload = new WPushButton( m_logDiv->footer() );
44404441
logDownload->setIcon( "InterSpec_resources/images/download_small.svg" );
44414442
logDownload->setStyleClass( "LinkBtn DownloadBtn" );
4443+
logDownload->setLinkTarget( Wt::TargetNewWindow );
44424444
#endif
44434445

44444446
logDownload->setText( "TXT file" );
@@ -4452,11 +4454,6 @@ void ShieldingSourceDisplay::showCalcLog()
44524454
downloadResource->suggestFileName( filename, WResource::DispositionType::Attachment );
44534455

44544456
logDownload->setLink( WLink(downloadResource) );
4455-
#if( BUILD_AS_OSX_APP )
4456-
logDownload->setTarget( AnchorTarget::TargetNewWindow );
4457-
#else
4458-
logDownload->setLinkTarget( Wt::TargetNewWindow );
4459-
#endif
44604457

44614458
WPushButton *close = m_logDiv->addCloseButtonToFooter();
44624459
close->clicked().connect( boost::bind( &AuxWindow::hide, m_logDiv ) );

0 commit comments

Comments
 (0)