chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

idk trying to add song_model to song_editor

Browse source
This commit is contained in:
Chris Cochrun 2023-12-01 09:55:11 -06:00
parent 791bcc146e
commit 69f053ffd3
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/rust/songs/song_editor.rs
View file

@ -1,3 +1,5 @@
use crate::songs::song_model::song_model::SongModel;
#[cxx_qt::bridge] #[cxx_qt::bridge]
pub mod song_editor { pub mod song_editor {
unsafe extern "C++" { unsafe extern "C++" {
@ -14,8 +16,8 @@ pub mod song_editor {
type QStringList = cxx_qt_lib::QStringList; type QStringList = cxx_qt_lib::QStringList;
include!("cxx-qt-lib/qlist.h"); include!("cxx-qt-lib/qlist.h");
type QList_QString = cxx_qt_lib::QList<QString>; type QList_QString = cxx_qt_lib::QList<QString>;
// #[cxx_name = "SongModel"] #[cxx_name = "SongModel"]
// type CxxSongs = crate::songs::song_model::qobject::SongModel; type SongModel = crate::songs::song_model::qobject::SongModel;
} }
unsafe extern "RustQt" { unsafe extern "RustQt" {
@ -36,6 +38,7 @@ pub mod song_editor {
#[qproperty(i32, font_size)] #[qproperty(i32, font_size)]
#[qproperty(bool, background_exists)] #[qproperty(bool, background_exists)]
#[qproperty(bool, audio_exists)] #[qproperty(bool, audio_exists)]
#[qproperty(*mut SongModel, song_model)]
type SongEditor = super::SongEditorRust; type SongEditor = super::SongEditorRust;
#[qinvokable] #[qinvokable]
@ -66,7 +69,7 @@ pub struct SongEditorRust {
font_size: i32, font_size: i32,
background_exists: bool, background_exists: bool,
audio_exists: bool, audio_exists: bool,
// song_model: *mut CxxSongs, song_model: *mut SongModel,
} }
impl Default for SongEditorRust { impl Default for SongEditorRust {
@ -87,17 +90,17 @@ impl Default for SongEditorRust {
font_size: 50, font_size: 50,
background_exists: true, background_exists: true,
audio_exists: true, audio_exists: true,
// song_model: std::ptr::null_mut(), song_model: std::ptr::null_mut(),
} }
} }
} }
impl song_editor::SongEditor { impl song_editor::SongEditor {
fn idk(mut self: Pin<&mut Self>) { fn idk(mut self: Pin<&mut Self>) {
// let mut model = self.song_model().as_mut().unwrap(); if let Some(model) = unsafe { self.song_model().as_mut() } {
// let pinned_model = Pin::new_unchecked(model); let pinned_model = unsafe { Pin::new_unchecked(model) };
// pinned_model.update_ccli(0, QString::from("idk")); pinned_model.update_ccli(0, QString::from("idk"));
todo!() }
} }
pub fn check_verse_order(mut self: Pin<&mut Self>) { pub fn check_verse_order(mut self: Pin<&mut Self>) {