open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(modulo): fix bug that prevented forms from being displayed on Linux

Browse Source
This commit is contained in:
Federico Terzi 2021-10-16 12:22:28 +02:00
parent 904f24a438
commit f9b256c1a3
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
espanso-modulo/build.rs
View File

@ -457,5 +457,22 @@ fn build_native() {
} }
fn main() { fn main() {
println!("cargo:rerun-if-changed=src/x11/native/native.h");
println!("cargo:rerun-if-changed=src/sys/interop/interop.h");
println!("cargo:rerun-if-changed=src/sys/form/form.cpp");
println!("cargo:rerun-if-changed=src/sys/common/mac.h");
println!("cargo:rerun-if-changed=src/sys/common/mac.mm");
println!("cargo:rerun-if-changed=src/sys/common/common.h");
println!("cargo:rerun-if-changed=src/sys/common/common.cpp");
println!("cargo:rerun-if-changed=src/sys/welcome/welcome_gui.h");
println!("cargo:rerun-if-changed=src/sys/welcome/welcome_gui.cpp");
println!("cargo:rerun-if-changed=src/sys/welcome/welcome.cpp");
println!("cargo:rerun-if-changed=src/sys/troubleshooting/troubleshooting_gui.h");
println!("cargo:rerun-if-changed=src/sys/troubleshooting/troubleshooting_gui.cpp");
println!("cargo:rerun-if-changed=src/sys/troubleshooting/troubleshooting.cpp");
println!("cargo:rerun-if-changed=src/sys/search/search.cpp");
println!("cargo:rerun-if-changed=src/sys/wizard/wizard.cpp");
println!("cargo:rerun-if-changed=src/sys/wizard/wizard_gui.cpp");
println!("cargo:rerun-if-changed=src/sys/wizard/wizard_gui.h");
build_native(); build_native();
} }

5
espanso-modulo/src/sys/common/common.cpp
View File

@ -26,9 +26,8 @@
#include "mac.h" #include "mac.h"
#endif #endif
void setFrameIcon(const char * iconPath, wxFrame * frame) { void setFrameIcon(wxString iconPath, wxFrame * frame) {
if (iconPath) { if (!iconPath.IsEmpty()) {
wxString iconPath(iconPath);
wxBitmapType imgType = wxICON_DEFAULT_TYPE; wxBitmapType imgType = wxICON_DEFAULT_TYPE;
#ifdef __WXMSW__ #ifdef __WXMSW__

2
espanso-modulo/src/sys/common/common.h
View File

@ -27,7 +27,7 @@
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif
void setFrameIcon(const char * iconPath, wxFrame * frame); void setFrameIcon(wxString iconPath, wxFrame * frame);
void Activate(wxFrame * frame); void Activate(wxFrame * frame);